瀏覽代碼

Small CSS modification for seum counters

Denis Merigoux 8 年之前
父節點
當前提交
30f2e2e91e
共有 4 個文件被更改,包括 42 次插入60 次删除
  1. 3 1
      counter/templates/baseTemplate.html
  2. 2 0
      counter/templates/counterTemplate.html
  3. 37 58
      counter/templates/homeTemplate.html
  4. 0 1
      deploy.sh

+ 3 - 1
counter/templates/baseTemplate.html

20
 		}
20
 		}
21
 
21
 
22
 		.seum-counter {
22
 		.seum-counter {
23
-			height: 75px;
23
+			height: 100px;
24
 			overflow: auto;
24
 			overflow: auto;
25
+			display: flex;
26
+			align-items: center;
25
 		}
27
 		}
26
 
28
 
27
 		.primary-counter {
29
 		.primary-counter {

+ 2 - 0
counter/templates/counterTemplate.html

43
             </form>
43
             </form>
44
         </div>
44
         </div>
45
         <div class="seum-counter panel-body" style="height:125px" id="container{{counter.id}}">
45
         <div class="seum-counter panel-body" style="height:125px" id="container{{counter.id}}">
46
+         <div style="width:100%">
46
           {% if counter.lastReset.noSeum %}
47
           {% if counter.lastReset.noSeum %}
47
             <strong>{% trans "No seum yet" %}.</strong><br />
48
             <strong>{% trans "No seum yet" %}.</strong><br />
48
           {% else %}
49
           {% else %}
73
               <button type="submit" class="btn btn-default btn-success">{% trans "Throw the seum" %}</button>
74
               <button type="submit" class="btn btn-default btn-success">{% trans "Throw the seum" %}</button>
74
             </div>
75
             </div>
75
           </form>
76
           </form>
77
+         </div>
76
         </div>
78
         </div>
77
       </div>
79
       </div>
78
     </div>
80
     </div>

+ 37 - 58
counter/templates/homeTemplate.html

1
-{% extends 'baseTemplate.html' %}
2
-
3
-{% load i18n %}
4
-{% load hashtags %}
5
-
6
-{% block title %}{% trans "Counters" %}{% endblock %}
7
-
8
-{% block content %}
1
+{% extends 'baseTemplate.html' %} {% load i18n %} {% load hashtags %} {% block title %}{% trans "Counters" %}{% endblock %} {% block content %}
9
 <div class="text-center">
2
 <div class="text-center">
10
 	<h1><a class="counter-link" href="{% url 'home' %}">SeumBook™</a></h1>
3
 	<h1><a class="counter-link" href="{% url 'home' %}">SeumBook™</a></h1>
11
 </div>
4
 </div>
29
 				<div class="primary-counter panel-body" id="container{{myCounter.id}}">
22
 				<div class="primary-counter panel-body" id="container{{myCounter.id}}">
30
 					<div style="width:100%;">
23
 					<div style="width:100%;">
31
 						{% if myCounter.lastReset.noSeum %}
24
 						{% if myCounter.lastReset.noSeum %}
32
-							<strong>{% trans "No seum yet" %}.</strong><br />
33
-						{% else %}
34
-							<strong>
25
+						<strong>{% trans "No seum yet" %}.</strong><br /> {% else %}
26
+						<strong>
35
 								{% if myCounter.lastReset.selfSeum %}
27
 								{% if myCounter.lastReset.selfSeum %}
36
 									{% trans "I got the seum" %} {{ myCounter.lastReset.formatted_delta }}.
28
 									{% trans "I got the seum" %} {{ myCounter.lastReset.formatted_delta }}.
37
 								{% else %}
29
 								{% else %}
38
 									{{ myCounter.lastReset.who.trigramme }} {% trans "threw me the seum" %} {{ myCounter.lastReset.formatted_delta }}.
30
 									{{ myCounter.lastReset.who.trigramme }} {% trans "threw me the seum" %} {{ myCounter.lastReset.formatted_delta }}.
39
 								{% endif %}
31
 								{% endif %}
40
-							</strong><br />
41
-						{% endif %}
32
+							</strong><br /> {% endif %}
42
 						<p>{{ myCounter.lastReset.reason | hashtag }}</p>
33
 						<p>{{ myCounter.lastReset.reason | hashtag }}</p>
43
 						<div class="text-center" id="button{{myCounter.id}}">
34
 						<div class="text-center" id="button{{myCounter.id}}">
44
 							<button class="btn btn-default btn-danger" type="button" onclick="revealSeumForm({{myCounter.id}})">
35
 							<button class="btn btn-default btn-danger" type="button" onclick="revealSeumForm({{myCounter.id}})">
130
 					</form>
121
 					</form>
131
 				</div>
122
 				</div>
132
 				<div class="seum-counter panel-body">
123
 				<div class="seum-counter panel-body">
133
-					{% if counter.lastReset.noSeum %}
134
-						<strong>{% trans "Has not got the seum yet" %}</strong><br />
135
-					{% else %}
124
+					<div style="width:100%">
125
+						{% if counter.lastReset.noSeum %}
126
+						<strong>{% trans "Has not got the seum yet" %}</strong><br /> {% else %}
136
 						<strong>
127
 						<strong>
137
 							{% if counter.lastReset.selfSeum %}
128
 							{% if counter.lastReset.selfSeum %}
138
 								{% trans "Got the seum" %} {{ counter.lastReset.formatted_delta }}.
129
 								{% trans "Got the seum" %} {{ counter.lastReset.formatted_delta }}.
139
 							{% else %}{% blocktrans with trigram=counter.lastReset.who.trigramme time_ago=counter.lastReset.formatted_delta %}Seum thrown by {{ trigram }} {{ time_ago }}.{% endblocktrans %}
130
 							{% else %}{% blocktrans with trigram=counter.lastReset.who.trigramme time_ago=counter.lastReset.formatted_delta %}Seum thrown by {{ trigram }} {{ time_ago }}.{% endblocktrans %}
140
 							{% endif %}
131
 							{% endif %}
141
-						</strong><br />
142
-					{% endif %}
143
-					<p>{{ counter.lastReset.reason | hashtag }}</p>
132
+						</strong><br /> {% endif %}
133
+						<p>{{ counter.lastReset.reason | hashtag }}</p>
134
+					</div>
144
 				</div>
135
 				</div>
145
 			</div>
136
 			</div>
146
 		</div>
137
 		</div>
155
 				</div>
146
 				</div>
156
 				<div class="panel-body timeline graphs">
147
 				<div class="panel-body timeline graphs">
157
 					{% if noTimeline %}
148
 					{% if noTimeline %}
158
-						<div class="text-center text-muted">
159
-							<p>{% trans "No seum in the last past 24h..." %}</p>
160
-						</div>
161
-					{% else %}
162
-						{{ line_chart.as_html }}
163
-					{% endif %}
149
+					<div class="text-center text-muted">
150
+						<p>{% trans "No seum in the last past 24h..." %}</p>
151
+					</div>
152
+					{% else %} {{ line_chart.as_html }} {% endif %}
164
 				</div>
153
 				</div>
165
 			</div>
154
 			</div>
166
 		</div>
155
 		</div>
173
 				</div>
162
 				</div>
174
 				<div class="panel-body graphs">
163
 				<div class="panel-body graphs">
175
 					{% if noBestSeum %}
164
 					{% if noBestSeum %}
176
-						<div class="text-center text-muted">
177
-							<p>{% trans "Nobody got the seum..." %}</p>
178
-						</div>
179
-					{% else %}
180
-						{{ best_chart.as_html }}
181
-					{% endif %}
165
+					<div class="text-center text-muted">
166
+						<p>{% trans "Nobody got the seum..." %}</p>
167
+					</div>
168
+					{% else %} {{ best_chart.as_html }} {% endif %}
182
 				</div>
169
 				</div>
183
 			</div>
170
 			</div>
184
 		</div>
171
 		</div>
191
 				</div>
178
 				</div>
192
 				<div class="panel-body graphs">
179
 				<div class="panel-body graphs">
193
 					{% if noBestLikees %}
180
 					{% if noBestLikees %}
194
-						<div class="text-center text-muted">
195
-							<p>{% trans "Nobody liked..." %}</p>
196
-						</div>
197
-					{% else %}
198
-						{{ likees_chart.as_html }}
199
-					{% endif %}
181
+					<div class="text-center text-muted">
182
+						<p>{% trans "Nobody liked..." %}</p>
183
+					</div>
184
+					{% else %} {{ likees_chart.as_html }} {% endif %}
200
 				</div>
185
 				</div>
201
 			</div>
186
 			</div>
202
 		</div>
187
 		</div>
209
 				</div>
194
 				</div>
210
 				<div class="panel-body graphs">
195
 				<div class="panel-body graphs">
211
 					{% if noBestHashtags %}
196
 					{% if noBestHashtags %}
212
-						<div class="text-center text-muted">
213
-							<p>{% trans "Nobody used any hashtag..." %}</p>
214
-						</div>
215
-					{% else %}
216
-						{{ hashtags_chart.as_html }}
217
-					{% endif %}
197
+					<div class="text-center text-muted">
198
+						<p>{% trans "Nobody used any hashtag..." %}</p>
199
+					</div>
200
+					{% else %} {{ hashtags_chart.as_html }} {% endif %}
218
 				</div>
201
 				</div>
219
 			</div>
202
 			</div>
220
 		</div>
203
 		</div>
227
 				</div>
210
 				</div>
228
 				<div class="panel-body graphs">
211
 				<div class="panel-body graphs">
229
 					{% if noBestLikers %}
212
 					{% if noBestLikers %}
230
-						<div class="text-center text-muted">
231
-							<p>{% trans "Nobody liked..." %}</p>
232
-						</div>
233
-					{% else %}
234
-						{{ likers_chart.as_html }}
235
-					{% endif %}
213
+					<div class="text-center text-muted">
214
+						<p>{% trans "Nobody liked..." %}</p>
215
+					</div>
216
+					{% else %} {{ likers_chart.as_html }} {% endif %}
236
 				</div>
217
 				</div>
237
 			</div>
218
 			</div>
238
 		</div>
219
 		</div>
245
 				</div>
226
 				</div>
246
 				<div class="panel-body graphs">
227
 				<div class="panel-body graphs">
247
 					{% if noSeumActivity %}
228
 					{% if noSeumActivity %}
248
-						<div class="text-center text-muted">
249
-							<p>{% trans "Nobody got the seum..." %}</p>
250
-						</div>
251
-					{% else %}
252
-						{{ activity_chart.as_html }}
253
-					{% endif %}
229
+					<div class="text-center text-muted">
230
+						<p>{% trans "Nobody got the seum..." %}</p>
231
+					</div>
232
+					{% else %} {{ activity_chart.as_html }} {% endif %}
254
 				</div>
233
 				</div>
255
 			</div>
234
 			</div>
256
 		</div>
235
 		</div>
276
 </div>
255
 </div>
277
 
256
 
278
 <script>
257
 <script>
279
-$(function () {
280
-  $('[data-toggle="tooltip"]').tooltip()
281
-})
258
+	$(function() {
259
+		$('[data-toggle="tooltip"]').tooltip()
260
+	})
282
 </script>
261
 </script>
283
 {% endblock %}
262
 {% endblock %}

+ 0 - 1
deploy.sh

1
 git pull
1
 git pull
2
-source env/bin/activate
3
 python manage.py compilemessages > /dev/null
2
 python manage.py compilemessages > /dev/null
4
 sudo service apache2 reload
3
 sudo service apache2 reload