From 275eb05a6b6ee0fb4da194a6e4587a69df23f95b Mon Sep 17 00:00:00 2001 From: Emmanouil Konstantinidis Date: Wed, 1 Feb 2017 12:47:49 +0000 Subject: [PATCH] Language Switcher --- .../static/rest_framework/docs/css/base.css | 23 +++++++++++-- .../templates/rest_framework/docs/index.html | 13 +++---- .../templates/rest_framework/docs/nav.html | 34 ------------------- .../rest_framework/docs/sidebar.html | 26 ++++++++++++++ 4 files changed, 51 insertions(+), 45 deletions(-) delete mode 100644 rest_framework/templates/rest_framework/docs/nav.html diff --git a/rest_framework/static/rest_framework/docs/css/base.css b/rest_framework/static/rest_framework/docs/css/base.css index d86ef172b..2b0797091 100644 --- a/rest_framework/static/rest_framework/docs/css/base.css +++ b/rest_framework/static/rest_framework/docs/css/base.css @@ -61,11 +61,20 @@ text-indent: 10px; } +.sidebar-nav > li > .nav > li { + text-indent: 30px; +} + + .sidebar-nav li a { display: block; - text-decoration: none; - color: #999999; border: 0; + font-size: 12px; + font-weight: normal; + color: #999999; + text-decoration: none; + text-transform: none; + padding: 8px 15px; } .sidebar-nav li a:hover { @@ -85,6 +94,15 @@ margin-bottom: 20px; } +.sidebar-wrapper .language-switcher { + text-align: center; + margin-bottom: 20px; +} + +.sidebar-wrapper .language-switcher .dropdown-menu { + min-width: 100px; +} + @media(min-width:768px) { #wrapper { padding-left: 250px; @@ -118,7 +136,6 @@ - // body { // // padding-top: 70px; // background-color: #f8f8f8; diff --git a/rest_framework/templates/rest_framework/docs/index.html b/rest_framework/templates/rest_framework/docs/index.html index 9af3136a7..f4b29e95c 100644 --- a/rest_framework/templates/rest_framework/docs/index.html +++ b/rest_framework/templates/rest_framework/docs/index.html @@ -30,7 +30,6 @@
- {% include "rest_framework/docs/sidebar.html" %} @@ -45,12 +44,6 @@
- - @@ -96,7 +89,11 @@ languageControls.not('[data-language="' + language +'"]').parent().removeClass("active") languageControls.filter('[data-language="' + language +'"]').parent().addClass("active") - button.closest("li.dropdown").find('.dropdown-toggle span').text(language) + console.log('-----'); + console.log(button); + console.log('-----'); + + button.closest(".btn-group").find('.dropdown-toggle span').first().text(language) var codeBlocks = $('pre.highlight') codeBlocks.not('[data-language="' + language +'"]').addClass("hide") diff --git a/rest_framework/templates/rest_framework/docs/nav.html b/rest_framework/templates/rest_framework/docs/nav.html deleted file mode 100644 index 150213d32..000000000 --- a/rest_framework/templates/rest_framework/docs/nav.html +++ /dev/null @@ -1,34 +0,0 @@ - - diff --git a/rest_framework/templates/rest_framework/docs/sidebar.html b/rest_framework/templates/rest_framework/docs/sidebar.html index 0823a87a3..ccb05f667 100644 --- a/rest_framework/templates/rest_framework/docs/sidebar.html +++ b/rest_framework/templates/rest_framework/docs/sidebar.html @@ -2,7 +2,33 @@