[copr] master: Alter displaying list of coprs (9c7d40e)

bkabrda at fedoraproject.org bkabrda at fedoraproject.org
Fri Jan 18 15:06:16 UTC 2013


Repository : http://git.fedorahosted.org/cgit/copr.git

On branch  : master

>---------------------------------------------------------------

commit 9c7d40e1401233122f8c7210b7980526831b013f
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Fri Jan 18 13:13:41 2013 +0100

    Alter displaying list of coprs


>---------------------------------------------------------------

 coprs_frontend/coprs/static/default_user.png   |  Bin 0 -> 1961 bytes
 coprs_frontend/coprs/static/style-new.css      |   98 ++++++++++++++++++++++-
 coprs_frontend/coprs/templates/coprs/show.html |   37 +++++----
 3 files changed, 115 insertions(+), 20 deletions(-)

diff --git a/coprs_frontend/coprs/static/default_user.png b/coprs_frontend/coprs/static/default_user.png
new file mode 100644
index 0000000..31b6c60
Binary files /dev/null and b/coprs_frontend/coprs/static/default_user.png differ
diff --git a/coprs_frontend/coprs/static/style-new.css b/coprs_frontend/coprs/static/style-new.css
index 01bbe6e..ade2ba1 100644
--- a/coprs_frontend/coprs/static/style-new.css
+++ b/coprs_frontend/coprs/static/style-new.css
@@ -1,20 +1,27 @@
 html, body {
   font-family: Cantarell, "Droid Sans", Verdana, sans-serif;
-  font-size: 0.9em;
+  font-size: 1em;
 
   margin: 0px;
   padding: 0px;
 }
 
+a {
+  color: #3d69a8;
+  text-decoration: none;
+}
+
 #logo {
   position: relative;
   top: 8px;
 }
 
 div.menu {
+  font-size: 0.9em;
   background-image: url("header_background.png");
   background-repeat: repeat-x;
   height: 81px;
+  margin-bottom: 3em;
 }
 
 div.login, div.login a {
@@ -34,13 +41,94 @@ div.page, div.menu-inner {
   margin-right: auto;
 }
 
-div.grey-box {
+div.user-info {
+  width: 174px;
+  margin-right: 25px;
+  float: left;
+  border-right: 1px solid #c3c3c3;
+
+  color: #565656;
+  font-size: 1.5em;
+  font-weight: bold;
+}
+
+div.user-info .coprs-count {
+  margin: 0px;
+  font-size: 0.8em;
+}
+
+div.user-info .other-text {
+  margin: 0px;
+  font-size: 0.6em;
+}
+
+div.coprs-list-thin, div.coprs-list-thick {
+  float: left;
+}
+
+div.coprs-list-thin {
+  width: 580px;
+}
+
+div.coprs-list-thick {
+  width: 100%;
+}
+
+div.copr {
+  width: 100%;
+  background-color: #f9f9f9;
+  padding-top: 1em;
+  padding-bottom: 1em;
+
+  border-radius: 5px;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+}
+
+div.copr * {
+  padding-left: 1em;
+  padding-right: 1em;
+}
+
+div.copr a {
+  font-size: 1.4em;
+  font-weight: bold;
+  display: block;
+}
+
+div.copr p {
+  margin-top: 0.3em;
+  margin-bottom: 0.3em;
+}
+
+div.copr .repos {
+  color: #808080;
+}
+
+div.add-copr {
   background-color: #ececec;
+  padding: 0.5em;
+  margin-bottom: 0.6em;
+
+  color: #cccccc;
+  text-align: center;
+  vertical-align: middle;
+  font-size: 1.1em;
+  font-weight: bold;
+
+  border-radius: 5px;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+}
+
+div.add-copr a {
+  text-decoration: none;
+  color: #666666;
 }
 
 input.rounded {
   padding-left: 4px;
-  border-radius:10px;
-  -moz-border-radius:10px;
-  -webkit-border-radius:10px;
+  border-radius: 10px;
+  -moz-border-radius: 10px;
+  -webkit-border-radius: 10px;
 }
diff --git a/coprs_frontend/coprs/templates/coprs/show.html b/coprs_frontend/coprs/templates/coprs/show.html
index c0524f3..710f84b 100644
--- a/coprs_frontend/coprs/templates/coprs/show.html
+++ b/coprs_frontend/coprs/templates/coprs/show.html
@@ -3,20 +3,27 @@
 {% block header %}Coprs List{% endblock %}
 {% from "_helpers.html" import render_pagination %}
 {% block body %}
-  <a href={{ url_for('coprs_ns.copr_add') }}>Add a new Copr</a>
-    {% for copr in coprs %}
-      <div class=copr>
-        <h2><a href="{{ url_for('coprs_ns.copr_detail', username = copr.owner.name, coprname = copr.name) }}">{{ copr.owner.name }}/{{ copr.name }}</a></h2>
-        builds: {{ copr.build_count }}<br>
-        {% if copr.repos %}
-          repos: {{ copr.repos_list|length }}
-        {% endif %}
-      </div>
-    {% else %}
-      <p><em>Unbelievable.  No entries here so far</em></p>
-    {% endfor %}
-  <div class=pagination>
-    {{ render_pagination(request, paginator) }}
+  {% if g.user %}
+  <div class="user-info">
+    <img src="{{ url_for('static', filename='default_user.png') }}" alt="User Image">
+    <p>{{ g.user.name }}</p>
+    <p class="coprs-count">11{# TODO #}</p>
+    <p class="other-text">coprs</p>
+  </div>
+  {% endif %}
+  <div class="coprs-list-{% if g.user %}thin{% else %}thick{% endif %}">
+    <div class="add-copr">+ <a href={{ url_for('coprs_ns.copr_add') }}>add a new Copr</a></div>
+      {% for copr in coprs %}
+        <div class="copr">
+          <a href="{{ url_for('coprs_ns.copr_detail', username = copr.owner.name, coprname = copr.name) }}">{{ copr.owner.name }}/{{ copr.name }}</a>
+	  <p>description blah blah blah</p>
+          <p class="repos">F18 blah blah</p>
+        </div>
+      {% else %}
+        <p>No coprs...</p>
+      {% endfor %}
+    <div class="pagination">
+      {{ render_pagination(request, paginator) }}
+    </div>
   </div>
-  <a href={{ url_for('coprs_ns.copr_add') }}>Add a new Copr</a>
 {% endblock %}



More information about the copr-devel mailing list