From 18bbce1de9423899c6126756d7823726ef1e2034 Mon Sep 17 00:00:00 2001 From: Belen Barros Date: Fri, 22 Feb 2013 15:45:35 +0000 Subject: [PATCH] Layer details style changes Changed to full screen layout to improve the table display and get rid of the accordion for the layer information. Signed-off-by: Belen Barros --- TODO | 1 + layerindex/detail.html | 206 +++++++++++---------------- layerindex/static/css/additional.css | 49 +++---- 3 files changed, 109 insertions(+), 147 deletions(-) diff --git a/TODO b/TODO index 246dbd5..7718cba 100644 --- a/TODO +++ b/TODO @@ -21,6 +21,7 @@ TODO: * Show layer notes records Later: +* Show count of layers to be reviewed next to review button * Ability for users to edit existing layers * Something to help with compatibility (although maybe this should just be handled using the existing versioned layer dependencies in layer.conf) * Query backend service? i.e. special URL to query information diff --git a/layerindex/detail.html b/layerindex/detail.html index 2ddea1a..c4718c7 100644 --- a/layerindex/detail.html +++ b/layerindex/detail.html @@ -22,132 +22,93 @@
-
-

{{ layeritem.name }}

-
+
+

{{ layeritem.name }} + {% if user.is_authenticated %} + {% if layeritem.status = "N" %} + Publish layer + {% endif %} + {% endif %} +

+
-
+
-
-
-
- -
-
- - Description - -
-
-
-

- {{ layeritem.description }} -

-

- {% if layeritem.usage_url %} - - Setup information - - {% endif %} -

-
-
-
- - {% if layeritem.dependencies_set.all %} -
- -
- - Dependencies - -
-
-
-

The {{ layeritem.name }} layer depends upon:

- -
-
-
+
+
+

+ {{ layeritem.description }} +

+

+ {% if layeritem.usage_url %} + + Setup information + {% endif %} +

-
+

Git repository

-
- - Repository - -
-
-
-

Git repository

-

{{ layeritem.vcs_url }}

- {% if layeritem.vcs_subdir %} -

Subdirectory

-

{{ layeritem.vcs_subdir }}

- {% endif %} -

- {% if layeritem.vcs_web_url %} - - web repo - - {% endif %} - {% if layeritem.tree_url %} - - tree - - {% endif %} -

+

{{ layeritem.vcs_url }} + {% if layeritem.vcs_web_url %} + + web repo + + {% endif %} +

-
-
-
+ {% if layeritem.vcs_subdir %} +

Subdirectory

+

{{ layeritem.vcs_subdir }} + {% if layeritem.tree_url %} + + web subdirectory + + {% endif %} +

+ {% endif %} -
+

{% if layeritem.active_maintainers|length = 1 %}Maintainer{% else %}Maintainers{% endif %}

-
- - Maintainer information - -
-
-
-
- {% for maintainer in layeritem.active_maintainers %} -
- {{ maintainer.name }} - - - - - -
- {% if maintainer.responsibility %} -
- {{ maintainer.responsibility }}
- {% endif %} - {% endfor %} -
-
-
-
+
    + {% for maintainer in layeritem.active_maintainers %} +
  • + {{ maintainer.name }} + {% if maintainer.responsibility %} + ({{ maintainer.responsibility }}) + {% endif %} -
+ + email + + + {% endfor %} + -
+
-
+
+ {% if layeritem.dependencies_set.all %} +
+

Dependencies

+

The {{ layeritem.name }} layer depends upon:

+ +
+ {% endif %} -
- -
- - +
+
+
+
+
+
+
{{ layeritem.name }} recipes
    @@ -175,24 +136,23 @@ {{ recipe.name }} {{ recipe.pv }} - {{ recipe.short_desc }} + {{ recipe.short_desc }} {% endfor %} +
+
+ + {% if user.is_authenticated %} + {% if layeritem.status = "N" %} + Publish layer + {% endif %} + {% endif %}
-
-
- - {% if user.is_authenticated %} -
- {% if layeritem.status = "N" %} - Publish - {% endif %} -
- {% endif %} +
{% endautoescape %} diff --git a/layerindex/static/css/additional.css b/layerindex/static/css/additional.css index 10c870e..4b96cd7 100644 --- a/layerindex/static/css/additional.css +++ b/layerindex/static/css/additional.css @@ -27,29 +27,30 @@ textarea { color:white; } -bs-docs-example:after { - background-color: #F5F5F5; - border: 1px solid #DDDDDD; - border-radius: 4px 0 4px 0; - color: #9DA0A4; - content: "Recipes"; - font-size: 12px; - font-weight: bold; - left: -1px; - padding: 3px 7px; - position: absolute; - top: -1px; -} - -.bs-docs-example { - background-color: #FFFFFF; - border: 1px solid #DDDDDD; - border-radius: 4px 4px 4px 4px; - margin: 15px 0; - padding: 39px 19px 14px; - position: relative; -} - .footer { text-align: center; -} \ No newline at end of file +} + +.description { + margin-bottom: 2em; +} + +.description p { + font-size: 1.2em; +} + +.description ul { + font-size: 1.2em; +} + +.description li { + margin-bottom: 0.5em; +} + +.dependency-well { + padding-top: 4px; +} + +h1 .btn { + font-weight: normal; +}