Skip to content

E
edx-platform
Commit 8f124e17 by Bridger Maxwell
Options

Got deletion working. 

--HG--
branch : bridgerwiki
parent 07f328f6
Showing with 93 additions and 103 deletions
simplewiki_edit.html
...@@ -14,6 +14,7 @@ ${ wiki_article.title } ...@@ -14,6 +14,7 @@ ${ wiki_article.title }
${wiki_form} ${wiki_form}
<input type="submit" value="Edit article" /></td> <input type="submit" name="edit" value="Edit article" />
<input type="submit" name="delete" value="Delete article" />
</form> </form>
</%block> </%block>
simplewiki_error.html
...@@ -18,85 +18,66 @@ ${wiki_error} ...@@ -18,85 +18,66 @@ ${wiki_error}
%endif %endif
%if wiki_err_notfound is not UNDEFINED: %if wiki_err_notfound is not UNDEFINED:
%if wiki_url is not UNDEFINED: %if wiki_url is not UNDEFINED:
<p> <p>
The page you requested could not be found. The page you requested could not be found.
Click <a href="${reverse("wiki_create", args=[wiki_url])}">here</a> to create it. Click <a href="${reverse("wiki_create", args=[wiki_url])}">here</a> to create it.
</p> </p>
%else: %else:
<p> <p>
Or maybe rather: Congratulations! It seems that there's no root Or maybe rather: Congratulations! It seems that there's no root
article, which is probably because you just installed simple-wiki article, which is probably because you just installed simple-wiki
and your installation is working. Now you can create the root article. and your installation is working. Now you can create the root article.
Click <a href="{% url wiki_create "" %}">here</a> to create it. Click <a href="{% url wiki_create "" %}">here</a> to create it.
</p> </p>
%endif %endif
%else: %else:
%if wiki_err_noparent is not UNDEFINED: %if wiki_err_noparent is not UNDEFINED:
<p> <p>
You cannot create this page, because its parent You cannot create this page, because its parent
does not exist. Click <a href="${reverse("wiki_create", args=[wiki_url_parent])}">here</a> does not exist. Click <a href="${reverse("wiki_create", args=[wiki_url_parent])}">here</a>
to create it. to create it.
</p> </p>
%else:
%if wiki_err_keyword is not UNDEFINED:
<p>
The page you're trying to create <b>${wiki_url}</b> starts with <b>_</b>, which is reserved for internal use.
</p>
%else: %else:
%if wiki_err_keyword is not UNDEFINED and wiki_err_keyword:
%if wiki_err_locked is not UNDEFINED: <p>
<p> The page you're trying to create <b>${wiki_url}</b> starts with <b>_</b>, which is reserved for internal use.
The article you are trying to modify is locked. </p>
</p> %elif wiki_err_locked is not UNDEFINED and wiki_err_locked:
%else: <p>
The article you are trying to modify is locked.
%if wiki_err_noread is not UNDEFINED: </p>
<p> %elif wiki_err_noread is not UNDEFINED and wiki_err_noread:
You do not have access to read this article. <p>
</p> You do not have access to read this article.
%else: </p>
%elif wiki_err_nowrite is not UNDEFINED and wiki_err_nowrite:
%if wiki_err_nowrite is not UNDEFINED: <p>
<p> You do not have access to edit this article.
You do not have access to edit this article. </p>
</p> %elif wiki_err_noanon is not UNDEFINED and wiki_err_noanon:
%else: <p>
Anonymous attachments are not allowed. Try logging in.
%if wiki_err_noanon is not UNDEFINED: </p>
<p> %elif wiki_err_create is not UNDEFINED and wiki_err_create:
Anonymous attachments are not allowed. Try logging in. <p>
</p> You do not have access to create this article.
%else: </p>
%elif wiki_err_encode is not UNDEFINED and wiki_err_encode:
%if wiki_err_create is not UNDEFINED: <p>
<p> The url you requested could not be handled by the wiki.
You do not have access to create this article. Probably you used a bad character in the URL.
</p> Only use digits, English letters, underscore and dash. For instance
/wiki/An_Article-1
</p>
%elif wiki_err_deleted is not UNDEFINED and wiki_err_deleted:
<p>
The article you tried to access has been deleted. You may be able to restore it to an earlier version in <a href="${reverse("wiki_history", args=[wiki_article.get_url(),1])}">history</a>, or create a new version <a href="${reverse("wiki_edit", args=[wiki_article.get_url()])}">edit</a>.
</p>
%else: %else:
<p>
%if wiki_err_encode is not UNDEFINED: An error has occured.
<p> </p>
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
</p>
%else:
<p>
An error has occured.
</p>
%endif
%endif
%endif
%endif
%endif
%endif
%endif %endif
%endif %endif
%endif %endif
......
simplewiki_history.html
...@@ -27,30 +27,32 @@ ${ wiki_article.title } ...@@ -27,30 +27,32 @@ ${ wiki_article.title }
<tbody> <tbody>
<% loopCount = 0 %> <% loopCount = 0 %>
%for revision in wiki_history: %for revision in wiki_history:
<% loopCount += 1 %> %if revision.deleted < 2 or show_delete_revision:
<tr style="border-top: 1px" ${'class="dark"' if (loopCount % 2) == 0 else ''}> <% loopCount += 1 %>
<td width="15px"> <tr style="border-top: 1px" class="${'dark ' if (loopCount % 2) == 0 else ''}${'deleted ' if (revision.deleted==2) else ''}" >
<input type="radio" name="revision" id="${revision.id}" value="${revision.id}"${"checked" if wiki_article.current_revision.id == revision.id else ""}/> <td width="15px">
<label for="${revision.id}"> <input type="radio" name="revision" id="${revision.id}" value="${revision.id}"${"checked" if wiki_article.current_revision.id == revision.id else ""}/>
${ revision } <label for="${revision.id}">
%if revision.previous_revision: ${ revision }
%if not revision.counter == revision.previous_revision.counter + 1: %if revision.previous_revision:
<br/>(based on ${revision.previous_revision}) %if not revision.counter == revision.previous_revision.counter + 1:
%endif <br/>(based on ${revision.previous_revision})
%endif %endif
</label> %endif
</td> </label>
<td> </td>
${ revision.revision_text if revision.revision_text else "<i>None</i>" }</td> <td>
<td class="diff"> ${ revision.revision_text if revision.revision_text else "<i>None</i>" }</td>
%for x in revision.get_diff(): <td class="diff">
${x|h}<br/> %for x in revision.get_diff():
%endfor </td> ${x|h}<br/>
<td>${revision.get_user} %endfor </td>
<br/> <td>${revision.get_user()}
${revision.revision_date.strftime("%b %d, %Y, %I:%M %p")} <br/>
</td> ${revision.revision_date.strftime("%b %d, %Y, %I:%M %p")}
</tr> </td>
</tr>
%endif
%endfor %endfor
</tbody> </tbody>
%if wiki_prev_page or wiki_next_page: %if wiki_prev_page or wiki_next_page:
...@@ -68,10 +70,15 @@ ${ wiki_article.title } ...@@ -68,10 +70,15 @@ ${ wiki_article.title }
</tfoot> </tfoot>
%endif %endif
</table> </table>
<input type="submit" value="Change revision" <input type="submit" name="change" value="Change revision"
%if not wiki_write: %if not wiki_write:
disabled="true" disabled="true"
%endif %endif
/> />
%if show_delete_revision:
<input type="submit" name="delete" value="Delete revision"/>
<input type="submit" name="restore" value="Restore revision"/>
<input type="submit" name="delete_all" value="Delete all revisions">
%endif
</form> </form>
</%block> </%block>
simplewiki_searchresults.html
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
<%block name="wiki_body"> <%block name="wiki_body">
%for article in wiki_search_results: %for article in wiki_search_results:
<a href="${reverse("wiki_view", args=[article.get_url()])}">${article.get_url()}</a><br/> <% article_deleted = not article.current_revision.deleted == 0 %>
<a href="${reverse("wiki_view", args=[article.get_url()])}">${article.get_url()} ${'(Deleted)' if article_deleted else ''}</a><br/>
%endfor %endfor
%if not wiki_search_results: %if not wiki_search_results:
......
simplewiki_view.html
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<%inherit file="simplewiki_base.html"/> <%inherit file="simplewiki_base.html"/>
<%block name="wiki_page_title"> <%block name="wiki_page_title">
${ wiki_article.title } ${ wiki_article.title } ${'<span style="color: red;">- Deleted Revision!</span>' if wiki_current_revision_deleted else ''}
</%block> </%block>
<%block name="wiki_body"> <%block name="wiki_body">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment