Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit 97d69a83f6d8947ad2194cafa461f12cd71d469c
Author: Adam Samalik <asamalik(a)redhat.com>
Date: Tue Aug 4 16:00:42 2015 +0200
[frontend] UI: breadcrumbs in panel
---------------------------------------------------------------
frontend/coprs_frontend/coprs/static/copr.css | 15 ++++++++++++++-
frontend/coprs_frontend/coprs/templates/api.html | 10 ++++++++++
.../coprs_frontend/coprs/templates/coprs/add.html | 4 +++-
.../coprs/templates/coprs/detail.html | 5 +++--
.../coprs_frontend/coprs/templates/coprs/show.html | 1 +
.../coprs/templates/coprs/show/fulltext.html | 4 +++-
.../coprs/templates/coprs/show/user.html | 4 +++-
.../coprs_frontend/coprs/templates/layout.html | 5 +++++
.../coprs_frontend/coprs/templates/status.html | 4 +++-
9 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/static/copr.css
b/frontend/coprs_frontend/coprs/static/copr.css
index 4dd21f7..b4d8812 100644
--- a/frontend/coprs_frontend/coprs/static/copr.css
+++ b/frontend/coprs_frontend/coprs/static/copr.css
@@ -1,9 +1,13 @@
+.navbar-sm { min-height:40px; height: 40px; }
+.navbar-sm .navbar-brand{ padding: 0px 12px;font-size: 16px;line-height: 40px; }
+.navbar-sm .navbar-nav > li > a { padding-top: 0px; padding-bottom: 0px;
line-height: 40px; }
+
#main-bar {
background-image: url('header_background.png');
background-repeat: repeat-x;
height: 75px;
color: white;
- margin-bottom: 30px;
+ //margin-bottom: 30px;
}
#main-bar .container {
@@ -25,6 +29,15 @@
height: 58px;
}
+div.breadcrumb-panel {
+ background-color: #eee;
+ border-bottom: 1px solid #ccc;
+}
+
+div.breadcrumb-panel ol.breadcrumb {
+ margin-bottom: 0px;
+}
+
.build-pending,.build-pending>a {
color: #55b;
}
diff --git a/frontend/coprs_frontend/coprs/templates/api.html
b/frontend/coprs_frontend/coprs/templates/api.html
index 5d0c749..9944d0e 100644
--- a/frontend/coprs_frontend/coprs/templates/api.html
+++ b/frontend/coprs_frontend/coprs/templates/api.html
@@ -2,6 +2,16 @@
{% block title %}API for Copr{% endblock %}
{% block header %}API for the Copr Build System{% endblock %}
{%block main_menu_api %}active{% endblock %}
+{% block breadcrumbs %}
+<ol class="breadcrumb">
+ <li>
+ <a href="{{ url_for('coprs_ns.coprs_show')
}}">Home</a>
+ </li>
+ <li class="active">
+ API
+ </li>
+</ol>
+{% endblock %}
{% block body %}
{% if error %}<p class="error"><strong>Error:</strong> {{
error }}</p>{% endif %}
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/add.html
b/frontend/coprs_frontend/coprs/templates/coprs/add.html
index 75dedc3..a74d42e 100644
--- a/frontend/coprs_frontend/coprs/templates/coprs/add.html
+++ b/frontend/coprs_frontend/coprs/templates/coprs/add.html
@@ -3,7 +3,7 @@
{% block header %}Add a new Project{% endblock %}
{% from "coprs/_coprs_forms.html" import copr_form %}
-{% block body %}
+{% block breadcrumbs %}
<ol class="breadcrumb">
<li>
<a href="{{ url_for('coprs_ns.coprs_show')
}}">Home</a>
@@ -15,6 +15,8 @@
New Project
</li>
</ol>
+{% endblock %}
+{% block body %}
<h1>Create a New Project</h1>
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail.html
b/frontend/coprs_frontend/coprs/templates/coprs/detail.html
index 40e73dd..0b9de70 100644
--- a/frontend/coprs_frontend/coprs/templates/coprs/detail.html
+++ b/frontend/coprs_frontend/coprs/templates/coprs/detail.html
@@ -1,7 +1,7 @@
{% extends "layout.html" %}
{% block title %}{{ copr.owner.name }}/{{ copr.name }} Copr{% endblock %}
{%block main_menu_projects %}active{% endblock %}
-{% block body %}
+{% block breadcrumbs %}
<ol class="breadcrumb">
<li>
<a href="{{ url_for('coprs_ns.coprs_show')
}}">Home</a>
@@ -15,13 +15,14 @@
{%block project_breadcrumb %}
{%endblock%}
</ol>
+{%endblock%}
+{% block body %}
<!-- PROJECT NAME -->
<h1>
<a href="{{ url_for('coprs_ns.coprs_by_owner',
username=copr.owner.name) }}">{{ copr.owner.name }}</a> /
<strong><a href="{{ url_for('coprs_ns.copr_detail',
username=copr.owner.name, coprname=copr.name) }}">{{ copr.name
}}</a></strong>
</h1>
-<br>
<!-- MENU -->
<ul class="nav nav-tabs">
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/show.html
b/frontend/coprs_frontend/coprs/templates/coprs/show.html
index 350173a..0604f1d 100644
--- a/frontend/coprs_frontend/coprs/templates/coprs/show.html
+++ b/frontend/coprs_frontend/coprs/templates/coprs/show.html
@@ -36,6 +36,7 @@
{{ render_pagination(request, paginator) }}
</div>
<div class="col-md-3 col-sm-4">
+ <br>
{% if g.user %}
<div class="panel panel-default">
<div class="panel-heading">
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/show/fulltext.html
b/frontend/coprs_frontend/coprs/templates/coprs/show/fulltext.html
index 69e81fd..fb713ec 100644
--- a/frontend/coprs_frontend/coprs/templates/coprs/show/fulltext.html
+++ b/frontend/coprs_frontend/coprs/templates/coprs/show/fulltext.html
@@ -3,7 +3,7 @@
{% block header %}Project List{% endblock %}
{% from "_helpers.html" import render_pagination %}
{% block search_box %}{{fulltext}}{% endblock %}
-{% block show_top %}
+{% block breadcrumbs %}
<ol class="breadcrumb">
<li>
<a href="{{ url_for('coprs_ns.coprs_show')
}}">Home</a>
@@ -12,5 +12,7 @@
Searching: {{fulltext}}
</li>
</ol>
+{% endblock %}
+{% block show_top %}
<h1> Search Results <small> {{fulltext}} </small></h1>
{% endblock %}
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/show/user.html
b/frontend/coprs_frontend/coprs/templates/coprs/show/user.html
index 7844e49..14175d8 100644
--- a/frontend/coprs_frontend/coprs/templates/coprs/show/user.html
+++ b/frontend/coprs_frontend/coprs/templates/coprs/show/user.html
@@ -2,7 +2,7 @@
{% block title %}Project List{% endblock %}
{% block header %}Project List{% endblock %}
{% from "_helpers.html" import render_pagination %}
-{% block show_top %}
+{% block breadcrumbs %}
<ol class="breadcrumb">
<li>
<a href="{{ url_for('coprs_ns.coprs_show')
}}">Home</a>
@@ -11,6 +11,8 @@
{{user.name}}
</li>
</ol>
+{% endblock %}
+{% block show_top %}
<div id="profile">
<img src="{{ user.gravatar_url }}" alt="User Image"
class="avatar">
diff --git a/frontend/coprs_frontend/coprs/templates/layout.html
b/frontend/coprs_frontend/coprs/templates/layout.html
index 658a26e..79e2f58 100644
--- a/frontend/coprs_frontend/coprs/templates/layout.html
+++ b/frontend/coprs_frontend/coprs/templates/layout.html
@@ -65,6 +65,11 @@
</div>
</div>
</nav>
+ <div class="breadcrumb-panel">
+ <div class="container">
+ {% block breadcrumbs %}{% endblock %}
+ </div>
+ </div>
{#
<nav class="navbar navbar-sm navbar-default navbar-static-top">
<div class="container">
diff --git a/frontend/coprs_frontend/coprs/templates/status.html
b/frontend/coprs_frontend/coprs/templates/status.html
index c477e4b..c7eaabb 100644
--- a/frontend/coprs_frontend/coprs/templates/status.html
+++ b/frontend/coprs_frontend/coprs/templates/status.html
@@ -2,7 +2,7 @@
{% block title %} Task queue - Copr {% endblock %}
{% block header %} Task queue - Copr {% endblock %}
{%block main_menu_status %}active{% endblock %}
-{% block body %}
+{% block breadcrumbs %}
<ol class="breadcrumb">
<li>
<a href="{{ url_for('coprs_ns.coprs_show')
}}">Home</a>
@@ -12,6 +12,8 @@
</li>
{%block status_breadcrumb %}{%endblock%}
</ol>
+{% endblock %}
+{% block body %}
<h1> Task queue </h1>
<ul class="nav nav-tabs">
<li class="{% block importing_selected %}{% endblock %}">