From 052906872e25724a0750bc92662126cfe8f45335 Mon Sep 17 00:00:00 2001 From: codethejason Date: Fri, 25 Dec 2015 11:56:34 -0500 Subject: [PATCH] Added box shadow class for uniform look This reverts commit 2c55f492ae001c210b4a4bec7fa0a89cbeaca19f. --- .gitignore | 1 + open_event/templates/admin/model/list.html | 239 +++++++++--------- .../admin/model/microlocation/list.html | 78 +++--- .../templates/admin/model/speaker/list.html | 106 ++++---- .../templates/admin/model/sponsor/list.html | 74 +++--- .../templates/admin/model/track/list1.html | 66 ++--- 6 files changed, 288 insertions(+), 276 deletions(-) diff --git a/.gitignore b/.gitignore index b402cc7440..50523dfa1f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ _mailinglist .cache/ test.db .idea/ +.bundle/ \ No newline at end of file diff --git a/open_event/templates/admin/model/list.html b/open_event/templates/admin/model/list.html index 032b94dcae..5700f8c2d7 100644 --- a/open_event/templates/admin/model/list.html +++ b/open_event/templates/admin/model/list.html @@ -13,144 +13,147 @@
- {% block model_menu_bar %} - + {% endblock %} - {% if filters %} - {{ model_layout.filter_form() }} -
- {% endif %} + {% if filters %} + {{ model_layout.filter_form() }} +
+ {% endif %} - {% block model_list_table %} - - + {% block model_list_table %} +
+ + + {% block list_header scoped %} + {% if actions %} + + {% endif %} + {% block list_row_actions_header %} + + {% endblock %} + {% set column = 0 %} + {% for c, name in list_columns %} + + {% set column = column + 1 %} + {% endfor %} + {% endblock %} + + + {% for row in data %} - {% block list_header scoped %} + {% block list_row scoped %} {% if actions %} - + {% endif %} - {% block list_row_actions_header %} - + {% block list_row_actions_column scoped %} + {% endblock %} - {% set column = 0 %} {% for c, name in list_columns %} - {% else %} - {{ name }} + {% endif %} {% else %} - {{ name }} - {% endif %} - {% if admin_view.column_descriptions.get(c) %} - + {% endif %} - - {% set column = column + 1 %} {% endfor %} {% endblock %} - - {% for row in data %} - - {% block list_row scoped %} - {% if actions %} - - {% endif %} - {% block list_row_actions_column scoped %} - + - {% endblock %} - {% for c, name in list_columns %} - {% if admin_view.is_editable(c) %} - {% if form.csrf_token %} - - {% else %} - - {% endif %} - {% else %} - - {% endif %} - {% endfor %} - {% endblock %} - - {% else %} - - - - {% endfor %} -
+ +   + {% if admin_view.is_sortable(c) %} + {% if sort_column == column %} + + {{ name }} + {% if sort_desc %} + + {% else %} + + {% endif %} + + {% else %} + {{ name }} + {% endif %} + {% else %} + {{ name }} + {% endif %} + {% if admin_view.column_descriptions.get(c) %} + + {% endif %} +
- - + +   + {% block list_row_actions scoped %} + {%- if admin_view.can_edit -%} + + + + {%- endif -%} + {%- if admin_view.can_delete -%} +
+ {{ delete_form.id(value=get_pk_value(row)) }} + {{ delete_form.url(value=return_url) }} + {{ delete_form.csrf_token }} + +
+ {%- endif -%} + {% endblock %} +
- {% if admin_view.is_sortable(c) %} - {% if sort_column == column %} - - {{ name }} - {% if sort_desc %} - - {% else %} - - {% endif %} - + {% if admin_view.is_editable(c) %} + {% if form.csrf_token %} + {{ form[c](pk=get_pk_value(row), value=get_value(row, c), csrf=form.csrf_token._value()) }}{{ form[c](pk=get_pk_value(row), value=get_value(row, c)) }}{{ get_value(row, c) }}
- - - {% block list_row_actions scoped %} - {%- if admin_view.can_edit -%} - - - - {%- endif -%} - {%- if admin_view.can_delete -%} -
- {{ delete_form.id(value=get_pk_value(row)) }} - {{ delete_form.url(value=return_url) }} - {{ delete_form.csrf_token }} - -
- {%- endif -%} + {% else %} +
+ {% block empty_list_message %} +
+ {{ admin_view.get_empty_list_message() }} +
{% endblock %}
{{ form[c](pk=get_pk_value(row), value=get_value(row, c), csrf=form.csrf_token._value()) }}{{ form[c](pk=get_pk_value(row), value=get_value(row, c)) }}{{ get_value(row, c) }}
- {% block empty_list_message %} -
- {{ admin_view.get_empty_list_message() }} -
- {% endblock %} -
- {{ lib.pager(page, num_pages, pager_url) }} - {% endblock %} + + {% endfor %} + + {{ lib.pager(page, num_pages, pager_url) }} + {% endblock %} - {{ actionlib.form(actions, get_url('.action_view')) }} + {{ actionlib.form(actions, get_url('.action_view')) }} +
{% endblock %} diff --git a/open_event/templates/admin/model/microlocation/list.html b/open_event/templates/admin/model/microlocation/list.html index f48ee8545a..b3936d8796 100644 --- a/open_event/templates/admin/model/microlocation/list.html +++ b/open_event/templates/admin/model/microlocation/list.html @@ -3,48 +3,50 @@ {% block body %}
-

Microlocation - - Add New - -

+
+

Microlocation + + Add New + +

- - - - - - - - - - - - - - - {% for microlocation in objects %} +
IdNameUrlLatitudeLongitudeFloorRoom
+ - - - - - - - - + + + + + + + + - {% endfor %} - -
- - - - - - - {{microlocation.id}}{{microlocation.name}}{{microlocation.url}}{{microlocation.latitude}}{{microlocation.longitude}}{{microlocation.floor}}{{microlocation.room}}IdNameUrlLatitudeLongitudeFloorRoom
+ + + {% for microlocation in objects %} + + + + + + + + + + {{microlocation.id}} + {{microlocation.name}} + {{microlocation.url}} + {{microlocation.latitude}} + {{microlocation.longitude}} + {{microlocation.floor}} + {{microlocation.room}} + + {% endfor %} + + +
diff --git a/open_event/templates/admin/model/speaker/list.html b/open_event/templates/admin/model/speaker/list.html index db1f7f2197..abbe629ed7 100644 --- a/open_event/templates/admin/model/speaker/list.html +++ b/open_event/templates/admin/model/speaker/list.html @@ -3,60 +3,62 @@ {% block body %}
-

Speaker - - Add New - -

- - - - - - - - - - - - - - - - - - - - {% for speaker in objects %} +
+

Speaker + + Add New + +

+
IdNamePhotobiographyemailwebtwittergithublinkedinorganisationpositioncountry
+ - - - - - - - - - - - - - + + + + + + + + + + + + + - {% endfor %} - -
- - - - - - - {{speaker.id}}{{speaker.name}} - {% if speaker.photo %} - - {% endif %} - {{speaker.biography}}{{speaker.email}}{{speaker.web}}{{speaker.twitter}}{{speaker.github}}{{speaker.linkedin}}{{speaker.organisation}}{{speaker.position}}{{speaker.country}}IdNamePhotobiographyemailwebtwittergithublinkedinorganisationpositioncountry
+ + + {% for speaker in objects %} + + + + + + + + + + {{speaker.id}} + {{speaker.name}} + + {% if speaker.photo %} + + {% endif %} + + {{speaker.biography}} + {{speaker.email}} + {{speaker.web}} + {{speaker.twitter}} + {{speaker.github}} + {{speaker.linkedin}} + {{speaker.organisation}} + {{speaker.position}} + {{speaker.country}} + + {% endfor %} + + +
{% endblock %} diff --git a/open_event/templates/admin/model/sponsor/list.html b/open_event/templates/admin/model/sponsor/list.html index f5e22a6995..470814ced0 100644 --- a/open_event/templates/admin/model/sponsor/list.html +++ b/open_event/templates/admin/model/sponsor/list.html @@ -3,44 +3,46 @@ {% block body %}
-

Sponsor - - Add New - -

- - - - - - - - - - - - {% for sponsor in objects %} +
+

Sponsor + + Add New + +

+
IdNameUrlLogo
+ - - - - - + + + + + - {% endfor %} - -
- - - - - - - {{sponsor.id}}{{sponsor.name}}{{sponsor.url}} - {% if sponsor.logo %} - - {% endif %} - IdNameUrlLogo
+ + + {% for sponsor in objects %} + + + + + + + + + + {{sponsor.id}} + {{sponsor.name}} + {{sponsor.url}} + + {% if sponsor.logo %} + + {% endif %} + + + {% endfor %} + + +
diff --git a/open_event/templates/admin/model/track/list1.html b/open_event/templates/admin/model/track/list1.html index be4276857f..31d4200b59 100644 --- a/open_event/templates/admin/model/track/list1.html +++ b/open_event/templates/admin/model/track/list1.html @@ -3,41 +3,43 @@ {% block body %}
-

Track - - Add New - -

+
+

Track + + Add New + +

- - - - - - - - - - - - {% for track in objects %} +
IdNameDescriptionImage
+ - - - - - + + + + + - {% endfor %} - -
- - - - - - - {{track.id}}{{track.name}}{{track.description}}{{track.track_image_url}}IdNameDescriptionImage
+ + + {% for track in objects %} + + + + + + + + + + {{track.id}} + {{track.name}} + {{track.description}} + {{track.track_image_url}} + + {% endfor %} + + +