diff --git a/myriad/schema.sql b/myriad/schema.sql index d99536d..a426cd2 100644 --- a/myriad/schema.sql +++ b/myriad/schema.sql @@ -34,7 +34,8 @@ CREATE TABLE icons ( CREATE TABLE groups ( id INTEGER PRIMARY KEY AUTOINCREMENT, - group_name TEXT NOT NULL + group_name TEXT NOT NULL, + group_description TEXT ); CREATE TABLE group_members ( @@ -58,4 +59,22 @@ CREATE TABLE pages ( member_id INTEGER NOT NULL, page_location TEXT NOT NULL, FOREIGN KEY (member_id) REFERENCES member (id) +); + +CREATE TABLE themes ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + theme_name TEXT NOT NULL, + color1 TEXT NOT NULL, + color2 TEXT NOT NULL, + color3 TEXT NOT NULL, + color4 TEXT NOT NULL, + color5 TEXT NOT NULL +); + +CREATE TABLE member_themes ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + theme_id INTEGER NOT NULL, + member_id INTEGER NOT NULL, + FOREIGN KEY (theme_id) REFERENCES themes (id), + FOREIGN KEY (member_id) REFERENCES member (id) ); \ No newline at end of file diff --git a/myriad/static/style.css b/myriad/static/style.css index a96b469..1f9ec10 100644 --- a/myriad/static/style.css +++ b/myriad/static/style.css @@ -93,6 +93,11 @@ form textarea{ border-width:5px; } +#manage_icons{ + max-height:400px; + overflow-y:scroll; +} + .icon{ diff --git a/myriad/templates/base.html b/myriad/templates/base.html index 24613ee..7dc75a4 100644 --- a/myriad/templates/base.html +++ b/myriad/templates/base.html @@ -13,7 +13,8 @@ {% if g.user %}
Manage
- + + {% endif %}
Administration
diff --git a/myriad/templates/full.html b/myriad/templates/full.html index e6182cf..c08bf50 100644 --- a/myriad/templates/full.html +++ b/myriad/templates/full.html @@ -5,10 +5,17 @@ {% endblock %} {% block content %} + +
+ jump to:
+ {% for member in memberlist %} + {{ member[3] }} | + {% endfor %} +
{% for member in memberlist %} -
+
{{ member[3] }} {{ member[4] }}
{% if member[6] != None %} @@ -19,7 +26,7 @@ {{ member[5] }}

- {% if g.user %}{% endif %} + {% if g.user %}{% endif %}
diff --git a/myriad/templates/manage/edit.html b/myriad/templates/manage/edit.html index 75e06fc..4a5af9b 100644 --- a/myriad/templates/manage/edit.html +++ b/myriad/templates/manage/edit.html @@ -24,15 +24,35 @@ - {% for icon in icons %} +
+ {% for icon in icons %} - -
- Set Main IconDelete Icon -
-
+ +
+ Set Main IconDelete Icon +
+
- {% endfor %} + {% endfor %} +
+ +
Manage Theme
+ + + + Click here to reset member theme to default {{ error }}