{{error}}
{{msg}}
- +
- {% for image in images %}
-
-
-
-
-  }}?r=thumb)
-
-
- {% endfor %}
+ {% for image in images %}{{ gallery_item(image) }}{% endfor %}
{% else %}
-
- {{ image.created_at }}
-
diff --git a/onlylegs/templates/image.html b/onlylegs/templates/image.html
index e8b0f8b..b747708 100644
--- a/onlylegs/templates/image.html
+++ b/onlylegs/templates/image.html
@@ -1,6 +1,7 @@
-{% extends 'layout.html' %}
+{% extends 'base.html' %}
{% block page_index %}
{% if return_page %}?page={{ return_page }}{% endif %}{% endblock %}
+
{% block head %}
@@ -10,14 +11,16 @@
{% endblock %}
-{% block content %}
-
-
-
-
-  }}?r=prev)
-
-
-
-
-
-
-
-
-
-
-
-
+
+{% block header %}
+
+
+
{{ config.WEBSITE_CONF.name }}
-
-
+ {% for subtag in image.exif[tag] %}
+
+
+ {% endfor %}
{% endblock %}
{% block script %}
{% endblock %}
\ No newline at end of file
diff --git a/onlylegs/templates/index.html b/onlylegs/templates/index.html
index e85cafb..eead3a8 100644
--- a/onlylegs/templates/index.html
+++ b/onlylegs/templates/index.html
@@ -1,16 +1,17 @@
-{% extends 'layout.html' %}
+{% extends 'base.html' %}
+{% from 'macros/image.html' import gallery_item %}
{% block head %}
{% endblock %}
-{% block nav_home %}selected{% endblock %}
-{% block content %}
+
+{% block header %}
+{% endblock %}
+{% block nav_home %}selected{% endblock %}
+{% block content %}
{% if images %}
-
-
+{% endblock %}
+
+{% block content %}
+
-
-
- Info
- -
-
-
-
+ | Author | -
- |
-
| Upload date | -{{ image.created_at }} | -
| Description | -{{ image.description }} | -
- {% for col in image.colours %}
-
- {% endfor %}
-
- {% if image.groups %}
-
- {% for group in image.groups %}
-
- {{ group['name'] }}
-
- {% endfor %}
-
- {% endif %}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Info
+
+
+
+ | Author | +
+ |
+
| Upload date | +{{ image.created_at }} | +
| Description | +{{ image.description }} | +
+ {% for col in image.colours %}
+
+ {% endfor %}
- {% for tag in image.exif %}
-
-
- {% endfor %}
-
- {% if tag == 'Photographer' %}
+ {% if image.groups %}
+
-
+ {% for group in image.groups %}
+ {{ group['name'] }}
+ {% endfor %}
+
+ {% endif %}
+
+ {% for tag in image.exif %}
+
+
+ {% if tag == 'Photographer' %}
+ {% if tag == 'Photographer' %}
Photographer
{% elif tag == 'Camera' %}
Camera
@@ -188,63 +180,55 @@
{% else %}
{{ tag }}
{% endif %}
-
-
-
- {% for subtag in image.exif[tag] %}
-
-
- | {{ subtag }} | - {% if image.exif[tag][subtag]['formatted'] %} - {% if image.exif[tag][subtag]['type'] == 'date' %} -{{ image.exif[tag][subtag]['formatted'] }} | - {% else %} -{{ image.exif[tag][subtag]['formatted'] }} | - {% endif %} - {% elif image.exif[tag][subtag]['raw'] %} -{{ image.exif[tag][subtag]['raw'] }} | - {% else %} -Oops, an error | - {% endif %} -
| {{ subtag }} | + {% if image.exif[tag][subtag]['formatted'] %} + {% if image.exif[tag][subtag]['type'] == 'date' %} +{{ image.exif[tag][subtag]['formatted'] }} | + {% else %} +{{ image.exif[tag][subtag]['formatted'] }} | + {% endif %} + {% elif image.exif[tag][subtag]['raw'] %} +{{ image.exif[tag][subtag]['raw'] }} | + {% else %} +Oops, an error | + {% endif %} +
- {% for image in images %}
-
-
-
-
-
-
-
- {% endfor %}
+
-
- {{ image.created_at }}
-
+ {% for image in images %}{{ gallery_item(image) }}{% endfor %}
{% else %}
diff --git a/onlylegs/templates/list.html b/onlylegs/templates/list.html
index 7ada8f9..8d8eb2e 100644
--- a/onlylegs/templates/list.html
+++ b/onlylegs/templates/list.html
@@ -1,5 +1,6 @@
-{% extends 'layout.html' %}
+{% extends 'base.html' %}
{% block nav_groups %}selected{% endblock %}
+
{% block head %}
{% if images %}{% endif %}
@@ -92,7 +93,8 @@
{% endif %}
{% endblock %}
-{% block content %}
+
+{% block header %}
+{% endblock %}
+{% block content %}
{% if groups %}
+{% endblock %}
+{% block content %}
{% for group in groups %}
- 0 %} style="background-color: rgba{{ group.images.0.colours.0 }};" {% endif %}>
+ 0 %} style="background-color: rgba{{ group.images.0.colours.0 }};"{% endif %}
+ >
+{% endblock %}
+{% block content %}
{% if images %}
By {{ group.author.username }}
{{ group.name }}
diff --git a/onlylegs/templates/profile.html b/onlylegs/templates/profile.html index 9dd8dff..4fbf9ca 100644 --- a/onlylegs/templates/profile.html +++ b/onlylegs/templates/profile.html @@ -1,4 +1,7 @@ -{% extends 'layout.html' %} +{% extends 'base.html' %} +{% from 'macros/image.html' import gallery_item %} +{% block nav_profile %}{% if user.id == current_user.id %}selected{% endif %}{% endblock %} + {% block head %} {% if user.picture %} @@ -22,8 +25,8 @@ } {% endblock %} -{% block nav_profile %}{% if user.id == current_user.id %}selected{% endif %}{% endblock %} -{% block content %} + +{% block header %}
{% if user.banner %}
 }})
@@ -67,28 +70,13 @@
@@ -67,28 +70,13 @@
Images
- {% for image in images %}
-
-
-
-
-
-
-
- {% endfor %}
+ {% for image in images %}{{ gallery_item(image) }}{% endfor %}
{% else %}
-
- {{ image.created_at }}
-
@@ -97,4 +85,3 @@
{% endif %}
{% endblock %}
-
diff --git a/onlylegs/templates/settings.html b/onlylegs/templates/settings.html
index 271911b..c68695a 100644
--- a/onlylegs/templates/settings.html
+++ b/onlylegs/templates/settings.html
@@ -1,7 +1,7 @@
-{% extends 'layout.html' %}
-
+{% extends 'base.html' %}
{% block nav_settings %}selected{% endblock %}
-{% block content %}
+
+{% block header %}