diff --git a/simplewiki_edit.html b/simplewiki_edit.html index fc35c48b30..fbb4b143a3 100644 --- a/simplewiki_edit.html +++ b/simplewiki_edit.html @@ -14,6 +14,7 @@ ${ wiki_article.title } ${wiki_form} - + + diff --git a/simplewiki_error.html b/simplewiki_error.html index eb78521fb0..c257ef9a90 100644 --- a/simplewiki_error.html +++ b/simplewiki_error.html @@ -18,85 +18,66 @@ ${wiki_error} %endif %if wiki_err_notfound is not UNDEFINED: -%if wiki_url is not UNDEFINED: -

-The page you requested could not be found. -Click here to create it. -

-%else: -

-Or maybe rather: Congratulations! It seems that there's no root -article, which is probably because you just installed simple-wiki -and your installation is working. Now you can create the root article. -Click here to create it. -

-%endif + %if wiki_url is not UNDEFINED: +

+ The page you requested could not be found. + Click here to create it. +

+ %else: +

+ Or maybe rather: Congratulations! It seems that there's no root + article, which is probably because you just installed simple-wiki + and your installation is working. Now you can create the root article. + Click here to create it. +

+ %endif %else: %if wiki_err_noparent is not UNDEFINED: -

-You cannot create this page, because its parent -does not exist. Click here -to create it. -

+

+ You cannot create this page, because its parent + does not exist. Click here + to create it. +

%else: - -%if wiki_err_keyword is not UNDEFINED: -

-The page you're trying to create ${wiki_url} starts with _, which is reserved for internal use. -

+%if wiki_err_keyword is not UNDEFINED and wiki_err_keyword: +

+ The page you're trying to create ${wiki_url} starts with _, which is reserved for internal use. +

+%elif wiki_err_locked is not UNDEFINED and wiki_err_locked: +

+ The article you are trying to modify is locked. +

+%elif wiki_err_noread is not UNDEFINED and wiki_err_noread: +

+ You do not have access to read this article. +

+%elif wiki_err_nowrite is not UNDEFINED and wiki_err_nowrite: +

+ You do not have access to edit this article. +

+%elif wiki_err_noanon is not UNDEFINED and wiki_err_noanon: +

+ Anonymous attachments are not allowed. Try logging in. +

+%elif wiki_err_create is not UNDEFINED and wiki_err_create: +

+ You do not have access to create this article. +

+%elif wiki_err_encode is not UNDEFINED and wiki_err_encode: +

+ The url you requested could not be handled by the wiki. + Probably you used a bad character in the URL. + Only use digits, English letters, underscore and dash. For instance + /wiki/An_Article-1 +

+%elif wiki_err_deleted is not UNDEFINED and wiki_err_deleted: +

+ The article you tried to access has been deleted. You may be able to restore it to an earlier version in history, or create a new version edit. +

%else: - -%if wiki_err_locked is not UNDEFINED: -

-The article you are trying to modify is locked. -

-%else: - -%if wiki_err_noread is not UNDEFINED: -

-You do not have access to read this article. -

-%else: - -%if wiki_err_nowrite is not UNDEFINED: -

-You do not have access to edit this article. -

-%else: - -%if wiki_err_noanon is not UNDEFINED: -

-Anonymous attachments are not allowed. Try logging in. -

-%else: - -%if wiki_err_create is not UNDEFINED: -

-You do not have access to create this article. -

-%else: - -%if wiki_err_encode is not UNDEFINED: -

-The url you requested could not be handled by the wiki. -Probably you used a bad character in the URL. -Only use digits, English letters, underscore and dash. For instance -/wiki/An_Article-1 -

- - -%else: -

-An error has occured. -

- - -%endif -%endif -%endif -%endif -%endif -%endif +

+ An error has occured. +

%endif %endif %endif diff --git a/simplewiki_history.html b/simplewiki_history.html index 936459354b..860310e5b0 100644 --- a/simplewiki_history.html +++ b/simplewiki_history.html @@ -27,30 +27,32 @@ ${ wiki_article.title } <% loopCount = 0 %> %for revision in wiki_history: - <% loopCount += 1 %> - - - - - - - ${ revision.revision_text if revision.revision_text else "None" } - - %for x in revision.get_diff(): - ${x|h}
- %endfor - ${revision.get_user} -
- ${revision.revision_date.strftime("%b %d, %Y, %I:%M %p")} - - + %if revision.deleted < 2 or show_delete_revision: + <% loopCount += 1 %> + + + + + + + ${ revision.revision_text if revision.revision_text else "None" } + + %for x in revision.get_diff(): + ${x|h}
+ %endfor + ${revision.get_user()} +
+ ${revision.revision_date.strftime("%b %d, %Y, %I:%M %p")} + + + %endif %endfor %if wiki_prev_page or wiki_next_page: @@ -68,10 +70,15 @@ ${ wiki_article.title } %endif - +%if show_delete_revision: + + + +%endif diff --git a/simplewiki_searchresults.html b/simplewiki_searchresults.html index 13513639c3..88b70c3b7e 100644 --- a/simplewiki_searchresults.html +++ b/simplewiki_searchresults.html @@ -16,7 +16,8 @@ <%block name="wiki_body"> %for article in wiki_search_results: - ${article.get_url()}
+ <% article_deleted = not article.current_revision.deleted == 0 %> + ${article.get_url()} ${'(Deleted)' if article_deleted else ''}
%endfor %if not wiki_search_results: diff --git a/simplewiki_view.html b/simplewiki_view.html index 31511e5d92..d939e3e1d8 100644 --- a/simplewiki_view.html +++ b/simplewiki_view.html @@ -3,7 +3,7 @@ <%inherit file="simplewiki_base.html"/> <%block name="wiki_page_title"> - ${ wiki_article.title } + ${ wiki_article.title } ${'- Deleted Revision!' if wiki_current_revision_deleted else ''} <%block name="wiki_body">