diff --git a/myriad/static/style.css b/myriad/static/style.css index c566772..35fe802 100644 --- a/myriad/static/style.css +++ b/myriad/static/style.css @@ -75,7 +75,7 @@ form textarea{ } .manage_images_2{ clear:both; - width:500px; + width:600px; } .manage_icons_3{ display:block; @@ -229,8 +229,9 @@ form textarea{ margin-top:20px; } #nav{ + margin-left:-20px; margin-right:20px; - flex:20%; + flex:25%; height:fit-content; position:sticky; position: -webkit-sticky; @@ -256,7 +257,13 @@ form textarea{ @media (max-width: 1000px) { #main{ - width:90%; + width:100%; + margin-left:-20px; + } + .profile{ + width:100%; + margin:auto; + margin-top:20px; } #nav{ display:none; @@ -274,7 +281,16 @@ form textarea{ margin-top:10px; } .container{ - margin:20px; + margin-top:20px; + margin-left:auto; + margin-right:auto; + width:300px; + } + .icon{ + width:80px; + height:80px; + } + .manage_icons_3, .manage_blinkies_3, .manage_stamps_3{ + clear:both; } - } diff --git a/myriad/templates/base.html b/myriad/templates/base.html index cd55b55..97a7ca0 100644 --- a/myriad/templates/base.html +++ b/myriad/templates/base.html @@ -8,7 +8,7 @@ {% endfor %} - + @@ -25,7 +25,7 @@
Manage
- + {% endif %} @@ -52,7 +52,11 @@
- Home | Full List | Groups | Blog + Home | + Full List | + Groups | + Blog | + {% if g.user %}Admin{% endif %}
diff --git a/myriad/templates/manage/admin.html b/myriad/templates/manage/admin.html index c3c8c86..eaa6d26 100644 --- a/myriad/templates/manage/admin.html +++ b/myriad/templates/manage/admin.html @@ -6,6 +6,12 @@ {% block content %}
+
+
Manage Members
+ Add new member

+ Manage groups

+ Site assets +
Front Log
Front change history
diff --git a/myriad/templates/manage/edit.html b/myriad/templates/manage/edit.html index c7e9a2e..1b0bdd7 100644 --- a/myriad/templates/manage/edit.html +++ b/myriad/templates/manage/edit.html @@ -33,9 +33,7 @@ - Delete member - WARNING: this is permanent and cannot be undone! - - + {% if unjoined_groups or joined_groups %}
Manage groups
@@ -55,11 +53,12 @@
+ {% endif %}
Manage Icons
- +
@@ -80,7 +79,7 @@
Manage Blinkies
- +
@@ -99,7 +98,7 @@
Manage Stamps
- +
@@ -123,6 +122,9 @@ {% if stamps %}Export stamps
{% endif %} {% if icons or blinkies or stamps %}Export all member data
{% endif %} +
+
Danger zone
+ Delete member - WARNING: this is permanent and cannot be undone! {% if edit_location %}