diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 54 | ||||
| -rw-r--r-- | templates/pagination.html | 6 | ||||
| -rw-r--r-- | templates/registration/login.html | 2 | ||||
| -rw-r--r-- | templates/registration/password_change_form.html | 2 | ||||
| -rw-r--r-- | templates/registration/password_reset_confirm.html | 2 | ||||
| -rw-r--r-- | templates/registration/password_reset_form.html | 2 | ||||
| -rw-r--r-- | templates/registration/registration_form.html | 2 | ||||
| -rw-r--r-- | templates/warningmgr/detail.html | 18 | ||||
| -rw-r--r-- | templates/warningmgr/index.html | 2 |
9 files changed, 47 insertions, 43 deletions
diff --git a/templates/base.html b/templates/base.html index e368bf0..4ae9c65 100644 --- a/templates/base.html +++ b/templates/base.html @@ -2,7 +2,7 @@ buildhistory-web - base template for output pages - Copyright (C) 2013 Intel Corporation + Copyright (C) 2016 Intel Corporation Licensed under the MIT license, see COPYING.MIT for details {% endcomment %} @@ -15,46 +15,50 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="stylesheet" href="{% static "css/bootstrap.css" %}" /> - <link rel="stylesheet" href="{% static "css/bootstrap-responsive.css" %}" /> + <link rel="stylesheet" href="{% static "css/bootstrap-theme.css" %}" /> <link rel="stylesheet" href="{% static "css/additional.css" %}" /> <title>Buildhistory{% block title_append %}{% endblock %}</title> </head> <body> - <div class="navbar navbar-fixed-top"> - <div class="navbar-inner"> - <div class="container"> - <a class="brand" href="{% url 'warning_list' %}"> + <nav class="navbar navbar-default navbar-fixed-top"> + <div class="container"> + <div class="navbar-header"> + <a class="navbar-brand" href="{% url 'warning_list' %}"> Buildhistory </a> + </div> + <div class="container"> {% block header %} - <ul class="nav"> + <ul class="nav navbar-nav"> <li {% if not reviewed %}class="active"{% endif %}><a href="{% url "warning_list" %}">{% trans "queue" %}</a></li> <li {% if reviewed %}class="active"{% endif %}><a href="{% url "warning_list_reviewed" %}">{% trans "reviewed" %}</a></li> </ul> - <ul class="nav pull-right"> - {% if user.is_authenticated %} - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + {% if user.is_authenticated %} + <div class="btn-group pull-right"> + <button class="btn btn-default navbar-btn dropdown-toggle" data-toggle="dropdown""> + <i class="glyphicon glyphicon-user"></i> {{ user.username }} <b class="caret"></b> - </a> - <ul class="dropdown-menu"> - <li><a href="{% url "auth_logout" %}">{% trans "Log out" %}</a></li> - <li><a href="{% url "auth_password_change" %}">{% trans "Change password" %}</a></li> - </ul> - </li> - {% else %} - <li> - <a href="{% url "auth_login" %}">{% trans "log in" %}</a> - </li> - {% endif %} - </ul> + </button> + <ul class="dropdown-menu"> + <li><a href="{% url "auth_logout" %}">{% trans "Log out" %}</a></li> + <li><a href="{% url "auth_password_change" %}">{% trans "Change password" %}</a></li> + </ul> + </div> + {% else %} + <div class="pull-right"> + <a class="btn btn-default navbar-btn" href="{% url 'auth_login' %}">{% trans "Log in" %}</a> + </div> + {% endif %} {% endblock %} </div> </div> - </div> + </nav> <div id="content" class="container top-padded"> {% block content %}{% endblock %} @@ -66,7 +70,7 @@ {% endblock %} </div> - <script src="{% static "js/jquery-1.7.2.js" %}"></script> + <script src="{% static "js/jquery-1.12.3.js" %}"></script> <script src="{% static "js/bootstrap.js" %}"></script> {% block scripts %} {% endblock %} diff --git a/templates/pagination.html b/templates/pagination.html index 8ca9bef..1c194b5 100644 --- a/templates/pagination.html +++ b/templates/pagination.html @@ -9,8 +9,8 @@ {% load addurlparameter %} -<div class="pagination pagination-centered"> - <ul> +<nav class="text-center"> + <ul class="pagination"> {% if page.has_previous %} <li><a href="{% addurlparameter 'page' page.previous_page_number %}">prev</a></li> {% else %} @@ -54,4 +54,4 @@ <li class="disabled"><span>next</span></li> {% endif %} </ul> -</div> +</nav> diff --git a/templates/registration/login.html b/templates/registration/login.html index 7f8a153..fe0fd17 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -5,7 +5,7 @@ <form id="login_form" method="post" action="."> {{ form.as_p }} - <input type="submit" class="btn" value="{% trans 'Log in' %}" /> + <input type="submit" class="btn btn-default" value="{% trans 'Log in' %}" /> <input type="hidden" name="next" value="{{ next }}" /> {% csrf_token %} </form> diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html index d74f39e..c349f3f 100644 --- a/templates/registration/password_change_form.html +++ b/templates/registration/password_change_form.html @@ -5,7 +5,7 @@ <form method="post" action="."> {{ form.as_p }} - <input type="submit" class="btn" value="{% trans 'Submit' %}" /> + <input type="submit" class="btn btn-default" value="{% trans 'Submit' %}" /> {% csrf_token %} </form> {% endblock %} diff --git a/templates/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html index 09fc9c1..98dd0b6 100644 --- a/templates/registration/password_reset_confirm.html +++ b/templates/registration/password_reset_confirm.html @@ -8,7 +8,7 @@ <form id="password_form" method="post" action="."> {{ form.as_p }} - <input type="submit" class="btn" value="{% trans 'Submit' %}" /> + <input type="submit" class="btn btn-default" value="{% trans 'Submit' %}" /> {% csrf_token %} </form> diff --git a/templates/registration/password_reset_form.html b/templates/registration/password_reset_form.html index a380af3..bb2ea93 100644 --- a/templates/registration/password_reset_form.html +++ b/templates/registration/password_reset_form.html @@ -5,7 +5,7 @@ <form id="password_form" method="post" action="."> {{ form.as_p }} - <input type="submit" class="btn" value="{% trans 'Submit' %}" /> + <input type="submit" class="btn btn-default" value="{% trans 'Submit' %}" /> {% csrf_token %} </form> {% endblock %} diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html index eac549b..f0864c1 100644 --- a/templates/registration/registration_form.html +++ b/templates/registration/registration_form.html @@ -5,7 +5,7 @@ <form id="registration_form" method="post" action="."> {{ form.as_p }} - <input type="submit" class="btn" value="{% trans 'Submit' %}" /> + <input type="submit" class="btn btn-default" value="{% trans 'Submit' %}" /> {% csrf_token %} </form> {% endblock %} diff --git a/templates/warningmgr/detail.html b/templates/warningmgr/detail.html index e515861..1dda20d 100644 --- a/templates/warningmgr/detail.html +++ b/templates/warningmgr/detail.html @@ -5,7 +5,7 @@ buildhistory-web - warning detail page template - Copyright (C) 2013 Intel Corporation + Copyright (C) 2016 Intel Corporation Licensed under the MIT license, see COPYING.MIT for details {% endcomment %} @@ -59,16 +59,16 @@ <div class="well"> {% if user.is_authenticated %} {% if warningitem.status != "N" %} - <a href="{% url "unreview" warningitem.id %}" class="btn">Un-review</a> + <a href="{% url "unreview" warningitem.id %}" class="btn btn-default">Un-review</a> {% endif %} {% if warningitem.status == "N" %} - <a href="{% url "actionreq" warningitem.id %}" class="btn">Action Required</a> - <a href="{% url "resolve" warningitem.id %}" class="btn">Resolve</a> - <a href="{% url "ignore" warningitem.id %}" class="btn">Ignore</a> + <a href="{% url "actionreq" warningitem.id %}" class="btn btn-default">Action Required</a> + <a href="{% url "resolve" warningitem.id %}" class="btn btn-default">Resolve</a> + <a href="{% url "ignore" warningitem.id %}" class="btn btn-default">Ignore</a> {% endif %} {% if warningitem.status == "A" %} - <a href="{% url "resolve" warningitem.id %}" class="btn">Resolve</a> - <a href="{% url "ignore" warningitem.id %}" class="btn">Ignore</a> + <a href="{% url "resolve" warningitem.id %}" class="btn btn-default">Resolve</a> + <a href="{% url "ignore" warningitem.id %}" class="btn btn-default">Ignore</a> {% endif %} {% endif %} </div> @@ -91,11 +91,11 @@ {% csrf_token %} <textarea rows="10" name="comment_text"></textarea> <br> -<input type="submit" value="Post" class="btn" /> +<input type="submit" value="Post" class="btn btn-default" /> </form> {% else %} <p>You must be logged in to post a comment</p> {% endif %} {% endautoescape %} -{% endblock %}
\ No newline at end of file +{% endblock %} diff --git a/templates/warningmgr/index.html b/templates/warningmgr/index.html index 02d29b8..b6f7074 100644 --- a/templates/warningmgr/index.html +++ b/templates/warningmgr/index.html @@ -73,7 +73,7 @@ Action: <select name="action"> <option value="resolve">Resolve</option> <option value="ignore">Ignore</option> </select> -<button type="submit" class="btn" title="Run the selected action" name="index" value="0">Go</button> +<button type="submit" class="btn btn-default" title="Run the selected action" name="index" value="0">Go</button> </div> </form> {% endif %} |