Merge branch 'master' of github.com:TracyWebTech/colab

Luan
2 parents 9deb5f2f b03ffc0e
Showing 3 changed files with 6 additions and 4 deletions Show diff stats
requirements.txt
src/templates/base.html
src/templates/includes/big_header.html
@@ -36,7 +36,8 @@ git+https://github.com/TracyWebTech/SleekXMPP@fix-gevent
  
 # Feedzilla (planet) and deps
 #feedzilla==0.22
-hg+https://bitbucket.org/lorien/feedzilla
+#hg+https://bitbucket.org/lorien/feedzilla
+hg+https://bitbucket.org/TracyWebTech/feedzilla/
 django-common
 feedparser
 lxml
@@ -5,19 +5,20 @@
   {% block head %}
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <title>Colab - {% block title %}Colab{% endblock %}</title>
  
     <link rel="stylesheet" href="{{ STATIC_URL }}third-party/bootstrap/css/bootstrap.min.css" type="text/css" media="screen, projection" />
  
     <link rel="stylesheet"
           href="{{ STATIC_URL }}third-party/font-awesome/css/font-awesome.min.css"
-          type="text/css" media="screen" charset="utf-8"/>
+          type="text/css" media="screen" />
  
     {% if not is_mobile %}
       {% conversejs_static %}
     {% endif %}
  
     <link rel="stylesheet" href="{{ STATIC_URL }}css/screen.css"
-                                type="text/css" media="screen" charset="utf-8"/>
+                                type="text/css" media="screen" />
  
     <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery-2.0.3.min.js"></script>
     <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.debouncedresize.js"></script>
@@ -2,7 +2,7 @@
  
 <div class="row hidden-xs hidden-sm">
   <div class="col-lg-2 col-lg-offset-5 text-center">
-    <img src="{{ STATIC_URL }}img/logo.png" />
+    <img src="{{ STATIC_URL }}img/logo.png" alt="Colab" />
   </div>
 </div>
...	...	@@ -36,7 +36,8 @@ git+https://github.com/TracyWebTech/SleekXMPP@fix-gevent
36	36
37	37	# Feedzilla (planet) and deps
38	38	#feedzilla==0.22
39		-hg+https://bitbucket.org/lorien/feedzilla
	39	+#hg+https://bitbucket.org/lorien/feedzilla
	40	+hg+https://bitbucket.org/TracyWebTech/feedzilla/
40	41	django-common
41	42	feedparser
42	43	lxml
...	...
...	...	@@ -5,19 +5,20 @@
5	5	{% block head %}
6	6	<meta charset="UTF-8" />
7	7	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
	8	+ <title>Colab - {% block title %}Colab{% endblock %}</title>
8	9
9	10	<link rel="stylesheet" href="{{ STATIC_URL }}third-party/bootstrap/css/bootstrap.min.css" type="text/css" media="screen, projection" />
10	11
11	12	<link rel="stylesheet"
12	13	href="{{ STATIC_URL }}third-party/font-awesome/css/font-awesome.min.css"
13		- type="text/css" media="screen" charset="utf-8"/>
	14	+ type="text/css" media="screen" />
14	15
15	16	{% if not is_mobile %}
16	17	{% conversejs_static %}
17	18	{% endif %}
18	19
19	20	<link rel="stylesheet" href="{{ STATIC_URL }}css/screen.css"
20		- type="text/css" media="screen" charset="utf-8"/>
	21	+ type="text/css" media="screen" />
21	22
22	23	<script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery-2.0.3.min.js"></script>
23	24	<script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery.debouncedresize.js"></script>
...	...
...	...	@@ -2,7 +2,7 @@
2	2
3	3	<div class="row hidden-xs hidden-sm">
4	4	<div class="col-lg-2 col-lg-offset-5 text-center">
5		- <img src="{{ STATIC_URL }}img/logo.png" />
	5	+ <img src="{{ STATIC_URL }}img/logo.png" alt="Colab" />
6	6	</div>
7	7	</div>
8	8
...	...