Download as
Browse Code »

Commit 04b3626479a3a81724e5967a7af3b21b5834e275

Authored by Lucas Kanashiro
Committed by Macartur Sousa
1 parent b103f417
Exists in spb-release/3.0 and in 2 other branches fix_cache_count_spb, layout-fix

Remove header and footer html to another file

Showing 3 changed files with 124 additions and 112 deletions   Show diff stats
colab/templates/base.html
  Diff comments   View file @04b3626
... ... @@ -70,102 +70,8 @@
70 70 {% endblock %}
71 71  
72 72 {% block navbar %}
73   - <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
74   - <div class="container">
75   - <div class="navbar-header">
76   -
77   - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main">
78   - <span class="sr-only">Toggle navigation</span>
79   - <span class="icon-bar"></span>
80   - <span class="icon-bar"></span>
81   - <span class="icon-bar"></span>
82   - <span class="icon-bar"></span>
83   - </button>
84   - <a class="navbar-brand" href="/"><img alt="Colab" src="{% static 'img/logo.svg' %}"></a>
85   - </div>
86   - <div class="collapse navbar-collapse navbar-main">
87   - <ul class="nav navbar-nav">
88   -
89   - <li>
90   - <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
91   - </li>
92   -
93   - {% if feedzilla %}
94   - <li>
95   - <a href="{% url "feedzilla_index" %}">{% trans "Blogs" %}</a>
96   - </li>
97   - {% endif %}
98   -
99   - {% proxy_menu %}
100   -
101   - <li><a href="/paste">{% trans "Paste" %}</a></li>
102   -
103   - <li class="hidden-lg hidden-md">
104   - <a href="{% url 'haystack_search' %}?q=">{% trans "Search" %}</a>
105   - </li>
106   - </ul>
107   -
108   - <ul class="nav navbar-nav navbar-right">
109   - {% if not user.is_authenticated %}
110   -
111   - <li class="dropdown hidden-xs hidden-lg">
112   - <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a>
113   - <ul class="dropdown-menu">
114   - {% trans 'Login' as login_text %}
115   - {% if BROWSERID_ENABLED %}
116   - <li>{% browserid_login text=login_text %}</li>
117   - {% else %}
118   - <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
119   - <li><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
120   - {% endif %}
121   - </ul>
122   - </li>
123   - {% trans 'Login' as login_text %}
124   - {% if BROWSERID_ENABLED %}
125   - <li class="visible-xs hidden-sm hidden-md">{% browserid_login text=login_text %}</li>
126   - {% else %}
127   - <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
128   - <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
129   - {% endif %}
130   - {% else %}
131   - <li id="user-menu" class="dropdown">
132   - <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
133   - <ul class="dropdown-menu" role="menu">
134   - <li>
135   - <div class="wrapper">
136   - <div class="thumbnail">{% gravatar user.email 100 %}</div>
137   - <div class="user-info">
138   - <span><b>{{ user.get_full_name }}</b></span>
139   - <span class="quiet">{{ user.email }}</span>
140   - </div>
141   - <div>
142   - <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
143   - {% trans 'Logout' as logout_text %}
144   - {% if BROWSERID_ENABLED %}
145   - {% browserid_logout text=logout_text link_class='btn btn-default pull-right' %}
146   - {% else %}
147   - <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a>
148   - {% endif %}
149   - </div>
150   - </div>
151   - </li>
152   - </ul>
153   - </li>
154   - {% endif %}
155   - </ul>
156   -
157   - <form action="{% url 'haystack_search' %}" method="GET" id="search-form" class="navbar-form navbar-right hidden-xs hidden-sm" role="search">
158   - <div class="form-group">
159   - <label class="sr-only" for="header-searchbox">{% trans 'Search here...' %}</label>
160   - <input name="q" id="header-searchbox"
161   - class="form-control" value="{{ request.GET.q }}"
162   - type="search" placeholder="{% trans 'Search here...' %}" />
163   - </div>
164   - <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
165   - </form>
166   - </div>
167   - </div>
168   - </nav>
  73 +
  74 + {% include "header.html" %}
169 75  
170 76 {% endblock %}
171 77  
... ... @@ -196,22 +102,9 @@
196 102 <div class="row">&nbsp;</div>
197 103  
198 104 {% block footer %}
199   - <div class="footer row">
200   - {% if user.is_staff %}
201   - <p class="col-lg-12 text-center">{% trans "Last email imported at" %} {{ last_imported_message.received_time|date:'DATETIME_FORMAT' }}</p>
202   - {% endif %}
203   - <p class="col-lg-12 text-center">
204   - <a href="{% url 'opendata' %}"><img src="{% static 'img/opendata3.png' %}"/></a>
205   - <a href="http://creativecommons.org/licenses/by-sa/4.0/deed.pt_BR"><img src="{% static 'img/cc_by_sa.png' %}"/></a>
206   - </p>
207   - <p class="col-lg-12 text-center">
208   - {% trans "The contents of this site is published under license" %}:
209   - <br>
210   - <a href="http://creativecommons.org/licenses/by-sa/4.0/deed.pt_BR">
211   - {% trans "Creative Commons 4.0 Brasil - Atribuir Fonte - Compartilhar Igual" %}.
212   - </a>
213   - </p>
214   - </div>
  105 +
  106 + {% include "footer.html" %}
  107 +
215 108 {% endblock %}
216 109  
217 110 {% if not is_mobile %}
... ...
colab/templates/footer.html 0 → 100644
  Diff comments   View file @04b3626
... ... @@ -0,0 +1,19 @@
  1 +{% load i18n browserid conversejs gravatar proxy %}
  2 +{% load static from staticfiles %}
  3 +
  4 +<div class="footer row">
  5 + {% if user.is_staff %}
  6 + <p class="col-lg-12 text-center">{% trans "Last email imported at" %} {{ last_imported_message.received_time|date:'DATETIME_FORMAT' }}</p>
  7 + {% endif %}
  8 + <p class="col-lg-12 text-center">
  9 + <a href="{% url 'opendata' %}"><img src="{% static 'img/opendata3.png' %}"/></a>
  10 + <a href="http://creativecommons.org/licenses/by-sa/4.0/deed.pt_BR"><img src="{% static 'img/cc_by_sa.png' %}"/></a>
  11 + </p>
  12 + <p class="col-lg-12 text-center">
  13 + {% trans "The contents of this site is published under license" %}:
  14 + <br>
  15 + <a href="http://creativecommons.org/licenses/by-sa/4.0/deed.pt_BR">
  16 + {% trans "Creative Commons 4.0 Brasil - Atribuir Fonte - Compartilhar Igual" %}.
  17 + </a>
  18 + </p>
  19 +</div>
... ...
colab/templates/header.html 0 → 100644
  Diff comments   View file @04b3626
... ... @@ -0,0 +1,100 @@
  1 +{% load i18n browserid conversejs gravatar proxy %}
  2 +{% load static from staticfiles %}
  3 +
  4 +<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
  5 + <div class="container">
  6 + <div class="navbar-header">
  7 +
  8 + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main">
  9 + <span class="sr-only">Toggle navigation</span>
  10 + <span class="icon-bar"></span>
  11 + <span class="icon-bar"></span>
  12 + <span class="icon-bar"></span>
  13 + <span class="icon-bar"></span>
  14 + </button>
  15 + <a class="navbar-brand" href="/"><img alt="Colab" src="{% static 'img/logo.svg' %}"></a>
  16 + </div>
  17 + <div class="collapse navbar-collapse navbar-main">
  18 + <ul class="nav navbar-nav">
  19 +
  20 + <li>
  21 + <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
  22 + </li>
  23 +
  24 + {% if feedzilla %}
  25 + <li>
  26 + <a href="{% url "feedzilla_index" %}">{% trans "Blogs" %}</a>
  27 + </li>
  28 + {% endif %}
  29 +
  30 + {% proxy_menu %}
  31 +
  32 + <li><a href="/paste">{% trans "Paste" %}</a></li>
  33 +
  34 + <li class="hidden-lg hidden-md">
  35 + <a href="{% url 'haystack_search' %}?q=">{% trans "Search" %}</a>
  36 + </li>
  37 + </ul>
  38 +
  39 + <ul class="nav navbar-nav navbar-right">
  40 + {% if not user.is_authenticated %}
  41 +
  42 + <li class="dropdown hidden-xs hidden-lg">
  43 + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a>
  44 + <ul class="dropdown-menu">
  45 + {% trans 'Login' as login_text %}
  46 + {% if BROWSERID_ENABLED %}
  47 + <li>{% browserid_login text=login_text %}</li>
  48 + {% else %}
  49 + <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
  50 + <li><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
  51 + {% endif %}
  52 + </ul>
  53 + </li>
  54 + {% trans 'Login' as login_text %}
  55 + {% if BROWSERID_ENABLED %}
  56 + <li class="visible-xs hidden-sm hidden-md">{% browserid_login text=login_text %}</li>
  57 + {% else %}
  58 + <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
  59 + <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
  60 + {% endif %}
  61 + {% else %}
  62 + <li id="user-menu" class="dropdown">
  63 + <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
  64 + <ul class="dropdown-menu" role="menu">
  65 + <li>
  66 + <div class="wrapper">
  67 + <div class="thumbnail">{% gravatar user.email 100 %}</div>
  68 + <div class="user-info">
  69 + <span><b>{{ user.get_full_name }}</b></span>
  70 + <span class="quiet">{{ user.email }}</span>
  71 + </div>
  72 + <div>
  73 + <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
  74 + {% trans 'Logout' as logout_text %}
  75 + {% if BROWSERID_ENABLED %}
  76 + {% browserid_logout text=logout_text link_class='btn btn-default pull-right' %}
  77 + {% else %}
  78 + <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a>
  79 + {% endif %}
  80 + </div>
  81 + </div>
  82 + </li>
  83 + </ul>
  84 + </li>
  85 + {% endif %}
  86 + </ul>
  87 +
  88 + <form action="{% url 'haystack_search' %}" method="GET" id="search-form" class="navbar-form navbar-right hidden-xs hidden-sm" role="search">
  89 + <div class="form-group">
  90 + <label class="sr-only" for="header-searchbox">{% trans 'Search here...' %}</label>
  91 + <input name="q" id="header-searchbox"
  92 + class="form-control" value="{{ request.GET.q }}"
  93 + type="search" placeholder="{% trans 'Search here...' %}" />
  94 + </div>
  95 + <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
  96 + </form>
  97 + </div>
  98 + </div>
  99 +</nav>
  100 +
... ...