Skip to content
Browse files

Merge pull request #993 from ubernostrum/toc-limit-845355

ToC depth front-end cleanup to match the backend.
  • Loading branch information...
2 parents 9b18535 + f620498 commit e53081af4e378de750789053b4cde32f6634870c @groovecoder groovecoder committed Apr 4, 2013
View
20 apps/wiki/templates/wiki/includes/ckeditor_scripts.html
@@ -2,22 +2,4 @@
<script src="{{ MEDIA_URL }}ckeditor/ckeditor.js"></script>
<script src="{{ MEDIA_URL }}ckeditor/adapters/jquery.js"></script>
<script src="{{ MEDIA_URL }}js/wiki_ckeditor.js"></script>
-
-<script type="text/javascript">
-$(document).ready(function() {
-
- var showing = 1,
- $show_toc_depth_block = $('#show_toc_depth_block');
-
- if($show_toc_depth_block.length) {
- $('#toc_customize').click(updateTocLevel);
- updateTocLevel();
- }
-
- function updateTocLevel() {
- showing = !showing;
- $show_toc_depth_block.animate({ 'opacity': showing ? 1 : 0 });
- }
-});
-</script>
-{% endif %}
+{% endif %}
View
4 apps/wiki/templates/wiki/includes/document_toc_field.html
@@ -1,10 +1,6 @@
<li>
<label><dfn title="{{_('Generate table of contents')}}">{{_('TOC:')}}</dfn></label>
- <div class="show_toc_block">
- {{ revision_form.show_toc | safe }}
- <a href="javascript:;" id="toc_customize">{{ _('customize') }}</a>
- </div>
<div id="show_toc_depth_block">
<label for="toc_depth" class="inline">
{{ _('In table of contents, show only levels up to and including:') }}
View
3 media/css/wiki-screen.css
@@ -248,8 +248,7 @@ a.edit-section:hover, a.edit-section:active, a.edit-section:focus { color: #333;
.editing ul.metadata li label { display: block; float: left; line-height: 2.5em; text-align: right; width: 10ex; font-weight: bold; padding-right: 0.25em; color: #888; }
.editing ul.metadata li label.inline { color:#000; width:auto; font-weight:normal; float:none; text-align:left; display:inline-block; padding-left:34px; }
.editing ul.metadata li .show_toc_block { padding: 7px 0 0 0; }
-.editing ul.metadata li a#toc_customize { /* display: inline-block; */ display: none; margin-left: 10px; font-size: 0.8em; color: #999; text-decoration: none; border-bottom: 1px dotted #999; }
-.editing ul.metadata li #show_toc_depth_block { margin-left: -12px; opacity: 0; }
+.editing ul.metadata li #show_toc_depth_block { margin-left: -12px; }
.editing ul.metadata li input, .editing ul.metadata li input#id_title { font-size: 1em; padding: 6px 8px; margin: 2px 0px; width: 70%; }
.editing ul.metadata li input[type="checkbox"] { width: auto; margin-left: 6px; }
.editing ul.metadata li .metadataDisplay { display:inline-block; padding: 8px 0 0 3px; }

0 comments on commit e53081a

Please sign in to comment.
Something went wrong with that request. Please try again.