Updated templates, and started to simplify templates structure

This commit is contained in:
Adolfo Gómez 2013-11-08 13:33:17 +00:00
parent aa2e532843
commit 7bbf86117b
13 changed files with 103 additions and 60 deletions

View File

@ -1,22 +1,17 @@
{% extends 'uds/html5/base.html' %}
{% extends "uds/html5/templates/base.html" %}
{% load i18n static %}
{% block title %}{% trans 'Page not found' %}{% endblock %}
{% block css %}
<style>
.center {text-align: center; margin-left: auto; margin-right: auto; margin-bottom: auto; margin-top: auto;}
</style>
{% endblock %}
{% block body %}
<div class="container">
<div class="row">
<div class="span12">
<div class="hero-unit center">
<div class="jumbotron center">
<h1>Page Not Found <small><font face="Tahoma" color="red">Error 404</font></small></h1>
<br />
<p>The page you requested could not be found, either contact your webmaster or try again. Use your browsers <b>Back</b> button to navigate to the page you have prevously come from</p>
<p><b>Or you could just press this neat little button:</b></p>
<a href="/" class="btn btn-large btn-info"><i class="icon-home icon-white"></i> Take Me Home</a>
<a href="/" class="btn btn-lg btn-info"><i class="fa fa-home"></i> Take Me Home</a>
</div>
<br />
</div>
</div>
</div>
{% endblock %}

View File

@ -1,22 +1,17 @@
{% extends 'uds/html5/base.html' %}
{% extends "uds/html5/templates/base.html" %}
{% load i18n static %}
{% block title %}{% trans 'Page not found' %}{% endblock %}
{% block css %}
<style>
.center {text-align: center; margin-left: auto; margin-right: auto; margin-bottom: auto; margin-top: auto;}
</style>
{% endblock %}
{% block body %}
<div class="container">
<div class="row">
<div class="span12">
<div class="hero-unit center">
<div class="jumbotron center">
<h1>Ooops<small><font face="Tahoma" color="red">Error 500</font></small></h1>
<br />
<p>The server raised an unexpected error, either contact your webmaster or try again. Use your browsers <b>Back</b> button to navigate to the page you have prevously come from</p>
<p><b>Or you could just press this neat little button:</b></p>
<a href="/" class="btn btn-large btn-info"><i class="icon-home icon-white"></i> Take Me Home</a>
<a href="/" class="btn btn-large btn-info"><i class="fa fa-home"></i> Take Me Home</a>
</div>
<br />
</div>
</div>
</div>
{% endblock %}

View File

@ -1,4 +1,4 @@
{% extends "uds/html5/templates/internal_page.html" %}
{% extends "uds/html5/templates/base.html" %}
{% load i18n static html5 %}
{% block title %}{% trans 'Available services list' %}{% endblock %}

View File

@ -62,10 +62,6 @@
</script>
{% endblock %}
{% block menu %}
{% include 'uds/html5/snippets/navbar_outter.html' %}
{% endblock %}
{% block body %}
<div class="container">
<div class="row" id="login">

View File

@ -1,4 +1,4 @@
{% extends "uds/html5/templates/internal_page.html" %}
{% extends "uds/html5/templates/base.html" %}
{% load i18n %}
{% load static %}

View File

@ -0,0 +1,19 @@
{% extends "uds/html5/templates/base.html" %}
{% load i18n static %}
{% block title %}{% trans 'Service not ready' %}{% endblock %}
{% block css %}
<style>
.center {text-align: center; margin-left: auto; margin-right: auto; margin-bottom: auto; margin-top: auto;}
</style>
{% endblock %}
{% block body %}
<div class="jumbotron center">
<h1> {% trans 'Service not ready' %}</h1>
<br />
<p>{% trans 'Service not ready at this moment. Please, try again in a while.' %}</p>
<h5>{% trans 'The service you has requested was not ready, and is being created right now. It will be availabe in a while ' %}</h5>
<br />
<a href="{% url 'uds.web.views.index' %}" class="btn btn-lg btn-info"><i class="fa fa-home"></i> {% trans "Back" %}</a>
</div>
{% endblock %}

View File

@ -0,0 +1,21 @@
{% extends "uds/html5/templates/base.html" %}
{% load i18n static %}
{% block body %}
<div class="panel panel-default text-center">
<div id="transport">
</div>
</div>
<div class="text-center">
<a href="{% url 'uds.web.views.index' %}" class="btn btn-info"><i class="fa fa-home"></i> {% trans "Back to services list" %}</a>
</div>
{% endblock %}
{% block js %}
<script>
$(document).ready(function(){
var v = "{{ transport|escapejs }}";
$('#transport').append(v);
});
</script>
{% endblock %}

View File

@ -3,6 +3,9 @@
{% csrf_token %}
<input id="id_language" type="hidden" name="language" value=""/>
<ul class="nav navbar-nav navbar-right">
{% if user.staff_member or user.is_admin %}
<li><a href="{% url "uds.web.views.download" idDownload='' %}">{% trans "Downloads" %}</a></li>
{% endif %}
<li><a href="#">{% trans 'About' %}</a></li>
<li class="dropdown">
{% for lang in LANGUAGES %}
@ -18,7 +21,7 @@
{% endfor %}
</ul>
</li>
{% if logout %}
{% if user and not user.is_anonymous %}
<li><a href="/logout"><span class="fa fa-power-off text-danger"></span> {% trans 'logout'|capfirst %}</a></li>
{% endif %}
</ul>

View File

@ -10,5 +10,39 @@
</button>
<a href="{% url 'uds.web.views.index' %}"><span class="navbar-brand">Universal Desktop Services</span></a>
</div>
{% block navbar %}{% endblock %}
<div class="collapse navbar-collapse navbar-ex1-collapse">
<ul class="nav navbar-nav">
{% if user and not user.is_anonymous %}
<li><a href="{% url "uds.web.views.prefs" %}" title="{% trans 'Preferences' %}">{{ user.real_name }}</a></li>
{% endif %}
</ul>
<form id="form_language" action="{% url "django.views.i18n.set_language" %}" method="post">
{% csrf_token %}
<input id="id_language" type="hidden" name="language" value=""/>
<ul class="nav navbar-nav navbar-right">
{% if user.staff_member or user.is_admin %}
<li><a href="{% url "uds.web.views.download" idDownload='' %}">{% trans "Downloads" %}</a></li>
{% endif %}
<li><a href="#">{% trans 'About' %}</a></li>
<li class="dropdown">
{% for lang in LANGUAGES %}
{% if lang.0 == LANGUAGE_CODE %}
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="glyphicon bfh-flag-{{ lang.0|country }}"></i>{% trans lang.1|capfirst %}<b class="caret"></b></a>
{% endif %}
{% endfor %}
<ul class="dropdown-menu">
{% for lang in LANGUAGES %}
{% if lang.0 != LANGUAGE_CODE %}
<li><a href="#" onclick='$("#id_language").val("{{ lang.0 }}"); $("#form_language").submit()'><i class="glyphicon bfh-flag-{{ lang.0|country }}"></i>{% trans lang.1|capfirst %}</a></li>
{% endif %}
{% endfor %}
</ul>
</li>
{% if user and not user.is_anonymous %}
<li><a href="/logout"><span class="fa fa-power-off text-danger"></span> {% trans 'logout'|capfirst %}</a></li>
{% endif %}
</ul>
</form>
</div>
</nav>

View File

@ -5,6 +5,6 @@
<ul class="nav navbar-nav">
<li><a href="{% url "uds.web.views.prefs" %}" title="{% trans 'Preferences' %}">{{ user.real_name }}</a></li>
</ul>
{% include "uds/html5/snippets/nav-right.html" with logout=True %}
{% include "uds/html5/snippets/nav-right.html" %}
</div>
{% endblock %}

View File

@ -2,6 +2,6 @@
{% load i18n static %}
{% block navbar %}
<div class="collapse navbar-collapse navbar-ex1-collapse">
{% include "uds/html5/snippets/nav-right.html" with logout=False %}
{% include "uds/html5/snippets/nav-right.html" %}
</div>
{% endblock %}

View File

@ -46,7 +46,7 @@
<body>
<!-- Navigation bar -->
{% block menu %}{% endblock %}
{% block menu %}{% include 'uds/html5/snippets/navbar.html' %}{% endblock %}
<!-- End of menu -->
<div class="container">
{% block messages %}

View File

@ -2,24 +2,4 @@
{% load i18n static html5 %}
{% block js %}
<script type="text/javascript">
$(document).ready(function() {
$('#admin ul').hide();
$("#admin").click(function(){
var lista = $('#admin ul');
if (lista.is(":hidden")) {
lista.slideDown("fast");
} else {
lista.hide();
}
});
});
</script>
{% endblock %}
{% block menu %}
{% include 'uds/html5/snippets/navbar_inner.html' %}
{% endblock %}