# HG changeset patch # User Ludovic Chabant # Date 1454824190 28800 # Node ID c2708f20a87b3f738e378cd40a2a6b50b6c7ed69 # Parent 200c7063affae8368b54bf3a06447c4ca3a0309b admin: Make the sidebar togglable for smaller screens. diff -r 200c7063affa -r c2708f20a87b foodtruck/assets/js/foodtruck.js --- a/foodtruck/assets/js/foodtruck.js Sat Feb 06 21:47:24 2016 -0800 +++ b/foodtruck/assets/js/foodtruck.js Sat Feb 06 21:49:50 2016 -0800 @@ -1,5 +1,10 @@ $(document).ready(function() { + $('.ft-nav-toggle').click(function() { + $('.ft-nav-container').toggleClass('ft-nav-enabled'); + $('.ft-nav').toggleClass('ft-nav-enabled'); + }); + $('.ft-nav-collapsed + ul').hide(); $('#ft-commit-modal').on('shown.bs.modal', function () { diff -r 200c7063affa -r c2708f20a87b foodtruck/assets/sass/foodtruck/_sidebar.scss --- a/foodtruck/assets/sass/foodtruck/_sidebar.scss Sat Feb 06 21:47:24 2016 -0800 +++ b/foodtruck/assets/sass/foodtruck/_sidebar.scss Sat Feb 06 21:49:50 2016 -0800 @@ -8,12 +8,23 @@ // Layout .ft-nav-container { padding: 2rem; + margin-top: 3em; transition: padding-left 0.5s ease; + transition: margin 0.5s ease; } .ft-nav-container.ft-nav-enabled { padding-left: $ft-nav-width + $ft-nav-margin; } +.ft-nav-toggle { + display: block; + z-index: 1001; + position: fixed; + top: 0; + left: 0; + transition: all 0.5s ease; +} + .ft-nav { z-index: 1000; position: fixed; @@ -30,8 +41,13 @@ } @media(min-width:768px) { + .ft-nav-toggle { + left: -3rem; + display: none; + } .ft-nav-container { padding-left: $ft-nav-width + $ft-nav-margin; + margin-top: 0; } .ft-nav { left: 0; @@ -39,6 +55,21 @@ } // Style +.ft-nav-toggle { + background: $ft-color-gray-darkest; + + a { + display: block; + padding: 0.2em 0.8em; + font-family: 'Lobster', cursive; + font-size: 2em; + } + a, a:hover, a:active, a:visited { + color: #fff; + text-decoration: none; + } +} + .ft-nav { background: $ft-color-gray-darkest; color: #fff; diff -r 200c7063affa -r c2708f20a87b foodtruck/templates/create_page.html --- a/foodtruck/templates/create_page.html Sat Feb 06 21:47:24 2016 -0800 +++ b/foodtruck/templates/create_page.html Sat Feb 06 21:49:50 2016 -0800 @@ -4,7 +4,6 @@ {% block content %}
-
{% for field in fields %}
@@ -29,7 +28,6 @@
-
{% endblock %} diff -r 200c7063affa -r c2708f20a87b foodtruck/templates/dashboard.html --- a/foodtruck/templates/dashboard.html Sat Feb 06 21:47:24 2016 -0800 +++ b/foodtruck/templates/dashboard.html Sat Feb 06 21:49:50 2016 -0800 @@ -1,61 +1,59 @@ {% extends 'layouts/default.html' %} {% block content %} -
-
-
- {% if needs_switch %} -
- {% for site in sites %} - {% if site.name != site_name %} - - {% endif %} - {% endfor %} -
- {% endif %} -
+
+
+ {% if needs_switch %} +
+ {% for site in sites %} + {% if site.name != site_name %} + + {% endif %} + {% endfor %} +
+ {% endif %}
-
-
-

{{site_title}}

-
+
+
+
+

{{site_title}}

-
-
-

Site Summary

- {% for s in sources %} - - {% endfor %} +
+
+
+

Site Summary

+ {% for s in sources %} + -
-

Work in Progress

- {% if new_pages %} -

New pages

-
    - {% for p in new_pages %} -
  • {{p.title}}
    - {%if p.text%}
    {{p.text}}
    {%endif%}
  • - {% endfor %} -
- {% endif %} - {% if edited_pages %} -

Edited pages

-
    - {% for p in edited_pages %} -
  • {{p.title}}
    - {%if p.text%}
    {{p.text}}
    {%endif%}
  • - {% endfor %} -
- {% endif %} - {% if not new_pages and not edited_pages %} -

No work in progress.

- {% endif %} + {% endfor %} +
+
+

Work in Progress

+ {% if new_pages %} +

New pages

+
    + {% for p in new_pages %} +
  • {{p.title}}
    + {%if p.text%}
    {{p.text}}
    {%endif%}
  • + {% endfor %} +
+ {% endif %} + {% if edited_pages %} +

Edited pages

+
    + {% for p in edited_pages %} +
  • {{p.title}}
    + {%if p.text%}
    {{p.text}}
    {%endif%}
  • + {% endfor %} +
+ {% endif %} + {% if not new_pages and not edited_pages %} +

No work in progress.

+ {% endif %} -
{% endblock %} diff -r 200c7063affa -r c2708f20a87b foodtruck/templates/edit_page.html --- a/foodtruck/templates/edit_page.html Sat Feb 06 21:47:24 2016 -0800 +++ b/foodtruck/templates/edit_page.html Sat Feb 06 21:49:50 2016 -0800 @@ -4,7 +4,6 @@ {% block content %}
-
@@ -57,7 +56,6 @@
-
{% endblock %} diff -r 200c7063affa -r c2708f20a87b foodtruck/templates/error.html --- a/foodtruck/templates/error.html Sat Feb 06 21:47:24 2016 -0800 +++ b/foodtruck/templates/error.html Sat Feb 06 21:49:50 2016 -0800 @@ -3,9 +3,7 @@ {% extends 'layouts/master.html' %} {% block content %} -
-

{{error}}

-
+

{{error}}

{% endblock %} diff -r 200c7063affa -r c2708f20a87b foodtruck/templates/install.html --- a/foodtruck/templates/install.html Sat Feb 06 21:47:24 2016 -0800 +++ b/foodtruck/templates/install.html Sat Feb 06 21:49:50 2016 -0800 @@ -3,8 +3,6 @@ {% extends 'layouts/master.html' %} {% block content %} -
- No FoodTruck configuration file was found. Did you run chef admin init? -
+

No FoodTruck configuration file was found. Did you run chef admin init?

{% endblock %} diff -r 200c7063affa -r c2708f20a87b foodtruck/templates/layouts/default.html --- a/foodtruck/templates/layouts/default.html Sat Feb 06 21:47:24 2016 -0800 +++ b/foodtruck/templates/layouts/default.html Sat Feb 06 21:49:50 2016 -0800 @@ -3,6 +3,9 @@ {% extends 'layouts/master.html' %} {% block after_content %} +
+ F +