LoCo Team Portal

Merge lp:~dholbach/loco-team-portal/css-fix-and-new-logo into lp:loco-team-portal

  1. css-fix-and-new-logo
  2. Merge into 0.2
Proposed by Daniel Holbach
Status: Merged
Merged at revision: not available
Proposed branch: lp:~dholbach/loco-team-portal/css-fix-and-new-logo
Merge into: lp:loco-team-portal
Diff against target: 239 lines (+68/-129)
3 files modified
loco_directory/media/css/common.css (+0/-62)
loco_directory/templates/base.html (+42/-42)
loco_directory/templates/index.html (+26/-25)
To merge this branch: bzr merge lp:~dholbach/loco-team-portal/css-fix-and-new-logo
Reviewer Review Type Date Requested Status
Dave Walker Approve
Review via email: mp+24022@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dave Walker (davewalker) wrote :

This appears to be mainly a code cleanup, and introducing the new logo. My testing suggests there aren't any regressions. Merging.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/media/css/common.css'
2--- loco_directory/media/css/common.css 2010-04-21 12:36:54 +0000
3+++ loco_directory/media/css/common.css 2010-04-23 15:09:17 +0000
4@@ -1,71 +1,9 @@
5-/*
6- * classes used throughout the site and template
7-*/
8-.rule {
9- margin: 0 auto;
10- clear: both;
11-}
12-img.rule {
13- width: 100%;
14-}
15-.collapsable {
16-
17-}
18-
19-.expanded {
20-
21-}
22-
23-.collapsed {
24-
25-}
26-.clear {
27- clear: both;
28-}
29-.quote {
30- display: block;
31- color: #333;
32-}
33-.graybg {
34- background-color: #f6f5f0;
35-}
36-.noundies {
37- text-decoration: none;
38-}
39-.small {
40- font-size: 90%;
41-}
42-.tiny {
43- font-size: 80%;
44-}
45-
46-body {
47- font-family: Tahoma, Sans, Arial, Helvetica, sans-serif;
48-}
49-h1, h2, h3, h4, h5, h6 {
50- font-family: "Trebuchet MS", "Trebuchet", "Nimbus Sans L", sans-serif;
51- color: #5A3320;
52- margin: 1em 0 .3em;
53-}
54-p {
55- margin: 1em 0 .3em;
56-}
57-pre {
58- background-color: #eee;
59- padding: 0.75em 1.5em;
60- font-size: 12px;
61- border: 1px solid #ddd;
62-}
63 a {
64 color: #D90D19;
65 }
66 a:visited {
67 color: #D90D19;
68 }
69-img {
70- border: none;
71-}
72-
73
74 /* Stuff for the 3Dbox */
75 .box {
76
77=== modified file 'loco_directory/media/img/ubuntulogo.png'
78Binary files loco_directory/media/img/ubuntulogo.png 2009-12-21 11:03:49 +0000 and loco_directory/media/img/ubuntulogo.png 2010-04-23 15:09:17 +0000 differ
79=== modified file 'loco_directory/templates/base.html'
80--- loco_directory/templates/base.html 2010-04-21 12:36:54 +0000
81+++ loco_directory/templates/base.html 2010-04-23 15:09:17 +0000
82@@ -32,53 +32,53 @@
83
84 <body class="ubuntu09 front not-logged-in page-node node-type-page no-sidebars">
85 <div id="page" class="container-16 clear-block">
86- <div id="container">
87- <div id="site-header" class="clear-block">
88- <div id="branding" class="container-16 clear-block">
89- <div id="site-subheader" class="clear-block">
90- <div id="header-region" class="region grid-16 clear-block">
91- <div id="block-block-46" class="block block-block">
92- <div class="content">
93- <div id="topNav">
94- <ul>
95- <li><a title="{% trans "Show all Teams" %}" href="{% url team-list %}">{% trans "Teams" %}</a></li>
96- <li><a title="{% trans "Show all Events" %}" href="{% url event-list %}">{% trans "Events" %}</a></li>
97- <li><a title="{% trans "Show all Venues" %}" href="{% url venue-list %}">{% trans "Venues" %}</a></li>
98- <li><a href="/about">{% trans "About LoCo Directory" %}</a></li>
99- {% if user.is_authenticated %}
100- {{ user.username }}
101- &nbsp;
102- <a href="/logout">{% trans "Log out" %}</a>
103- {% else %}
104- <a href="/openid/login?next={{login_next}}">{% trans "Log in" %}</a>
105- {% endif %}
106- </ul>
107- <a href="/" id="ubuntulogo">Ubuntu</a>
108- <div class="clear"><img src="http://www.ubuntu.com/themes/ubuntu07/images/spacer.gif" width="1" height="1" alt="" /></div>
109+ <div id="site-header" class="clear-block">
110+ <div id="branding" class="container-16 clear-block">
111+ <div id="site-subheader" class="clear-block">
112+ <div id="header-region" class="region grid-16 clear-block">
113+ <div id="block-block-46" class="block block-block">
114+ <div class="content">
115+ <div id="topNav">
116+ <ul>
117+ <li><a title="{% trans "Show all Teams" %}" href="{% url team-list %}">{% trans "Teams" %}</a></li>
118+ <li><a title="{% trans "Show all Events" %}" href="{% url event-list %}">{% trans "Events" %}</a></li>
119+ <li><a title="{% trans "Show all Venues" %}" href="{% url venue-list %}">{% trans "Venues" %}</a></li>
120+ <li><a href="/about">{% trans "About LoCo Directory" %}</a></li>
121+ <li>
122+ {% if user.is_authenticated %}
123+ {{ user.username }}&nbsp;<a href="/logout">{% trans "Log out" %}</a>
124+ {% else %}
125+ <a href="/openid/login?next={{login_next}}">{% trans "Log in" %}</a>
126+ {% endif %}
127+ </li>
128+ </ul>
129+ <a href="/"><img src="/media/img/ubuntulogo.png" style="margin: 10px;" alt="Ubuntu LoCo Directory" /></a>
130+ <div class="clear">
131+ <img src="http://www.ubuntu.com/themes/ubuntu07/images/spacer.gif" width="1" height="1" alt="" />
132 </div>
133- </div>
134+ </div>
135 </div>
136- <div id="block-block-58" class="block block-block">
137- <div class="content">
138- <div id="homemasthead">
139- <div class="headings">
140-{% if messages %}
141-{% for message in messages %}
142-<p>{{ message }}</p>
143-{% endfor %}
144-{% endif %}
145- </div>
146+ </div>
147+ <div id="block-block-58" class="block block-block">
148+ <div class="content">
149+ <div id="homemasthead">
150+ <div class="headings">
151+ {% if messages %}
152+ {% for message in messages %}
153+ <p>{{ message }}</p>
154+ {% endfor %}
155+ {% endif %}
156 </div>
157 </div>
158 </div>
159- <div id="homemiddle">
160- <div id="main" class="column grid-16 ">
161- <div id="main-content" class="region clear-block">
162-{% block content %}
163-{% endblock %}
164- </div>
165- </div>
166- </div>
167+ </div>
168+ <div id="homemiddle">
169+ <div id="main" class="column grid-16 ">
170+ <div id="main-content" class="region clear-block">
171+ {% block content %}
172+ {% endblock %}
173+ </div>
174+ </div>
175 </div>
176 </div>
177 <div id="footer" class="clear-block clear">
178
179=== modified file 'loco_directory/templates/index.html'
180--- loco_directory/templates/index.html 2010-02-15 17:01:55 +0000
181+++ loco_directory/templates/index.html 2010-04-23 15:09:17 +0000
182@@ -6,31 +6,32 @@
183 {% block content %}
184
185 <div class="mainpage">
186-
187-<h1>{% trans "Ubuntu LoCo Team Directory" %}</h1>
188-
189-<table><tr><td width="50%" valign="top">
190-
191-<h2><a href="{% url team-list %}">{% trans "Teams" %}</a></h2>
192-<p>{% trans "List of all Ubuntu LoCo Teams, with full information such as contact, web pages, mailing list, and more." %}
193-{% trans "If there are no teams in your country/region/area, you will be able to add a team in the near future." %}
194-</p>
195-<h2><a href="{% url event-list %}">{% trans "Events" %}</a></h2>
196-<p>{% trans "List of all Ubuntu LoCo Events, with full information such as location, attendees, teams, and more." %}
197-</p>
198-<h2><a href="{% url venue-list %}">{% trans "Venues" %}</a></h2>
199-<p>{% trans "List of all Ubuntu LoCo Venues." %}
200-</p>
201-
202-</td><td valign="top">
203-<h2><a href="#">{% trans "Coming Soon!" %}</a></h2>
204-<p>{% trans "Future additions to this site will include:" %}
205-<ul>
206-<li>Team Collaboration</li>
207-<li>Various mashups</li>
208-</ul>
209-</p>
210-</td></tr></table>
211+ <h1>{% trans "Ubuntu LoCo Team Directory" %}</h1>
212+ <table>
213+ <tr>
214+ <td width="50%" valign="top">
215+ <h2><a href="{% url team-list %}">{% trans "Teams" %}</a></h2>
216+ <p>
217+ {% trans "List of all Ubuntu LoCo Teams, with full information such as contact, web pages, mailing list, and more." %}
218+ {% trans "If there are no teams in your country/region/area, you will be able to add a team in the near future." %}
219+ </p>
220+ <h2><a href="{% url event-list %}">{% trans "Events" %}</a></h2>
221+ <p>{% trans "List of all Ubuntu LoCo Events, with full information such as location, attendees, teams, and more." %}</p>
222+ <h2><a href="{% url venue-list %}">{% trans "Venues" %}</a></h2>
223+ <p>{% trans "List of all Ubuntu LoCo Venues." %}</p>
224+ </td>
225+ <td valign="top">
226+ <h2><a href="#">{% trans "Coming Soon!" %}</a></h2>
227+ <div>
228+ {% trans "Future additions to this site will include:" %}
229+ <ul>
230+ <li>Team Collaboration</li>
231+ <li>Various mashups</li>
232+ </ul>
233+ </div>
234+ </td>
235+ </tr>
236+ </table>
237
238 </div>
239 {% endblock %}

Subscribers

People subscribed via source and target branches