LoCo Team Portal

Merge lp:~toabctl/loco-team-portal/fixes-523709 into lp:loco-team-portal

  1. fixes-523709
  2. Merge into 0.2
Proposed by Thomas Bechtold
Status: Merged
Merged at revision: not available
Proposed branch: lp:~toabctl/loco-team-portal/fixes-523709
Merge into: lp:loco-team-portal
Diff against target: 438 lines (+93/-260)
7 files modified
loco_directory/media/css/common.css (+84/-0)
loco_directory/media/css/events.css (+0/-84)
loco_directory/media/css/style.css (+2/-0)
loco_directory/media/css/teams.css (+0/-85)
loco_directory/media/css/venues.css (+0/-84)
loco_directory/templates/404.html (+6/-3)
loco_directory/templates/base.html (+1/-4)
To merge this branch: bzr merge lp:~toabctl/loco-team-portal/fixes-523709
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+19653@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Can you refresh this once lp:~toabctl/loco-directory/fix-523747 is fixed?

Revision history for this message
Daniel Holbach (dholbach) :
review: Needs Fixing
lp:~toabctl/loco-team-portal/fixes-523709 updated
66. By Thomas Bechtold

fix urls for events and venues

67. By Thomas Bechtold

add . at the end of sentences

Revision history for this message
Thomas Bechtold (toabctl) wrote :

i don't know how to update the translations correct. please do that.

Revision history for this message
Daniel Holbach (dholbach) wrote :

Good work!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'loco_directory/media/css/common.css'
--- loco_directory/media/css/common.css 2009-12-22 21:29:31 +0000
+++ loco_directory/media/css/common.css 2010-02-20 12:38:16 +0000
@@ -161,3 +161,87 @@
161}161}
162162
163163
164/* Stuff for the 3Dbox */
165.box {
166 background: #edf5e1;
167 padding: 10px 20px 10px;
168 position: relative;
169 border-top: solid 2px #c4df9b;
170}
171
172.dbox {
173 position: absolute;
174 padding: 0px;
175 z-index: 0;
176}
177
178.vert {
179 top: 0px;
180 height: 100%;
181 background-repeat: repeat-y;
182}
183
184.box-left {
185 background-image: url(../img/box/left.png);
186 left: -10px;
187 width: 24px;
188}
189
190.box-right {
191 background-image: url(../img/box/right.png);
192 right: -10px;
193 width: 34px;
194
195}
196
197.horz {
198 left: 0px;
199 width: 100%;
200 background-repeat: repeat-x;
201}
202
203.box-top {
204 background-image: url(../img/box/top.png);
205 top: -10px;
206 height: 24px;
207}
208
209.box-bottom {
210 background-image: url(../img/box/bottom.png);
211 bottom: -10px;
212 height: 34px;
213}
214
215.box-top-left {
216 background-image: url(../img/box/top-left.png);
217 top: -10px;
218 left: -10px;
219 height: 24px;
220 width: 24px;
221}
222
223.box-top-right {
224 background-image: url(../img/box/top-right.png);
225 top: -10px;
226 right: -10px;
227 height: 24px;
228 width: 34px;
229}
230
231.box-bottom-left {
232 background-image: url(../img/box/bottom-left.png);
233 bottom: -10px;
234 left: -10px;
235 height: 34px;
236 width: 24px;
237}
238
239.box-bottom-right {
240 background-image: url(../img/box/bottom-right.png);
241 bottom: -10px;
242 right: -10px;
243 height: 34px;
244 width: 34px;
245}
246
247
164248
=== modified file 'loco_directory/media/css/events.css'
--- loco_directory/media/css/events.css 2010-01-11 22:24:24 +0000
+++ loco_directory/media/css/events.css 2010-02-20 12:38:16 +0000
@@ -1,14 +1,6 @@
1/*1/*
2 * This CSS file is used to all pages dealing with Events2 * This CSS file is used to all pages dealing with Events
3 */3 */
4
5.box {
6 background: #edf5e1;
7 padding: 10px 20px 10px;
8 position: relative;
9 border-top: solid 2px #c4df9b;
10}
11
12th[scope="row"] {4th[scope="row"] {
13 text-align: right;5 text-align: right;
14 border: 0px solid red;6 border: 0px solid red;
@@ -112,79 +104,3 @@
112 background-image: url(../img/edit-delete.png)104 background-image: url(../img/edit-delete.png)
113}105}
114106
115.dbox {
116 position: absolute;
117 padding: 0px;
118 z-index: 0;
119}
120
121.vert {
122 top: 0px;
123 height: 100%;
124 background-repeat: repeat-y;
125}
126
127.box-left {
128 background-image: url(../img/box/left.png);
129 left: -10px;
130 width: 24px;
131}
132
133.box-right {
134 background-image: url(../img/box/right.png);
135 right: -10px;
136 width: 34px;
137
138}
139
140.horz {
141 left: 0px;
142 width: 100%;
143 background-repeat: repeat-x;
144}
145
146.box-top {
147 background-image: url(../img/box/top.png);
148 top: -10px;
149 height: 24px;
150}
151
152.box-bottom {
153 background-image: url(../img/box/bottom.png);
154 bottom: -10px;
155 height: 34px;
156}
157
158.box-top-left {
159 background-image: url(../img/box/top-left.png);
160 top: -10px;
161 left: -10px;
162 height: 24px;
163 width: 24px;
164}
165
166.box-top-right {
167 background-image: url(../img/box/top-right.png);
168 top: -10px;
169 right: -10px;
170 height: 24px;
171 width: 34px;
172}
173
174.box-bottom-left {
175 background-image: url(../img/box/bottom-left.png);
176 bottom: -10px;
177 left: -10px;
178 height: 34px;
179 width: 24px;
180}
181
182.box-bottom-right {
183 background-image: url(../img/box/bottom-right.png);
184 bottom: -10px;
185 right: -10px;
186 height: 34px;
187 width: 34px;
188}
189
190
191107
=== modified file 'loco_directory/media/css/style.css'
--- loco_directory/media/css/style.css 2010-02-18 10:32:46 +0000
+++ loco_directory/media/css/style.css 2010-02-20 12:38:16 +0000
@@ -1,6 +1,8 @@
1@import "common.css";1@import "common.css";
2@import "layout.css";2@import "layout.css";
3@import "teams.css";3@import "teams.css";
4@import "venues.css";
5@import "events.css";
46
5body {7body {
6 background-image: url(../img/bgrepeat.jpg);8 background-image: url(../img/bgrepeat.jpg);
79
=== modified file 'loco_directory/media/css/teams.css'
--- loco_directory/media/css/teams.css 2010-01-20 07:16:14 +0000
+++ loco_directory/media/css/teams.css 2010-02-20 12:38:16 +0000
@@ -1,14 +1,6 @@
1/*1/*
2 * This CSS file is used to all pages dealing with Teams2 * This CSS file is used to all pages dealing with Teams
3 */3 */
4
5.box {
6 background: #edf5e1;
7 padding: 10px 20px 10px;
8 position: relative;
9 border-top: solid 2px #c4df9b;
10}
11
12.box .delete {4.box .delete {
13 position: absolute;5 position: absolute;
14 top: 10px;6 top: 10px;
@@ -190,80 +182,3 @@
190 width: 100%;182 width: 100%;
191 height: 90px;183 height: 90px;
192}184}
193
194.dbox {
195 position: absolute;
196 padding: 0px;
197 z-index: 0;
198}
199
200.vert {
201 top: 0px;
202 height: 100%;
203 background-repeat: repeat-y;
204}
205
206.box-left {
207 background-image: url(../img/box/left.png);
208 left: -10px;
209 width: 24px;
210}
211
212.box-right {
213 background-image: url(../img/box/right.png);
214 right: -10px;
215 width: 34px;
216
217}
218
219.horz {
220 left: 0px;
221 width: 100%;
222 background-repeat: repeat-x;
223}
224
225.box-top {
226 background-image: url(../img/box/top.png);
227 top: -10px;
228 height: 24px;
229}
230
231.box-bottom {
232 background-image: url(../img/box/bottom.png);
233 bottom: -10px;
234 height: 34px;
235}
236
237.box-top-left {
238 background-image: url(../img/box/top-left.png);
239 top: -10px;
240 left: -10px;
241 height: 24px;
242 width: 24px;
243}
244
245.box-top-right {
246 background-image: url(../img/box/top-right.png);
247 top: -10px;
248 right: -10px;
249 height: 24px;
250 width: 34px;
251}
252
253.box-bottom-left {
254 background-image: url(../img/box/bottom-left.png);
255 bottom: -10px;
256 left: -10px;
257 height: 34px;
258 width: 24px;
259}
260
261.box-bottom-right {
262 background-image: url(../img/box/bottom-right.png);
263 bottom: -10px;
264 right: -10px;
265 height: 34px;
266 width: 34px;
267}
268
269
270185
=== modified file 'loco_directory/media/css/venues.css'
--- loco_directory/media/css/venues.css 2010-02-18 10:32:46 +0000
+++ loco_directory/media/css/venues.css 2010-02-20 12:38:16 +0000
@@ -1,14 +1,6 @@
1/*1/*
2 * This CSS file is used to all pages dealing with Events2 * This CSS file is used to all pages dealing with Events
3 */3 */
4
5.box {
6 background: #edf5e1;
7 padding: 10px 20px 10px;
8 position: relative;
9 border-top: solid 2px #c4df9b;
10}
11
12th[scope="row"] {4th[scope="row"] {
13 text-align: right;5 text-align: right;
14 border: 0px solid red;6 border: 0px solid red;
@@ -67,79 +59,3 @@
67 background-image: url(../img/edit-team.png)59 background-image: url(../img/edit-team.png)
68}60}
6961
70.dbox {
71 position: absolute;
72 padding: 0px;
73 z-index: 0;
74}
75
76.vert {
77 top: 0px;
78 height: 100%;
79 background-repeat: repeat-y;
80}
81
82.box-left {
83 background-image: url(../img/box/left.png);
84 left: -10px;
85 width: 24px;
86}
87
88.box-right {
89 background-image: url(../img/box/right.png);
90 right: -10px;
91 width: 34px;
92
93}
94
95.horz {
96 left: 0px;
97 width: 100%;
98 background-repeat: repeat-x;
99}
100
101.box-top {
102 background-image: url(../img/box/top.png);
103 top: -10px;
104 height: 24px;
105}
106
107.box-bottom {
108 background-image: url(../img/box/bottom.png);
109 bottom: -10px;
110 height: 34px;
111}
112
113.box-top-left {
114 background-image: url(../img/box/top-left.png);
115 top: -10px;
116 left: -10px;
117 height: 24px;
118 width: 24px;
119}
120
121.box-top-right {
122 background-image: url(../img/box/top-right.png);
123 top: -10px;
124 right: -10px;
125 height: 24px;
126 width: 34px;
127}
128
129.box-bottom-left {
130 background-image: url(../img/box/bottom-left.png);
131 bottom: -10px;
132 left: -10px;
133 height: 34px;
134 width: 24px;
135}
136
137.box-bottom-right {
138 background-image: url(../img/box/bottom-right.png);
139 bottom: -10px;
140 right: -10px;
141 height: 34px;
142 width: 34px;
143}
144
145
14662
=== modified file 'loco_directory/templates/404.html'
--- loco_directory/templates/404.html 2010-02-15 17:01:55 +0000
+++ loco_directory/templates/404.html 2010-02-20 12:38:16 +0000
@@ -11,9 +11,12 @@
1111
1212
13<div class="main">13<div class="main">
14 <h2><a href="{% url team-list %}">{% trans "You can browse the full list of teams" %}</a></h2>14 <ul>
15 <p>{% trans "If you believe the reason you are here is a bug in the LoCo Directory please " %} <a href='https://bugs.launchpad.net/loco-directory'>{% trans "Report it!" %}</a>15 <li><a href="{% url team-list %}">{% trans "You can browse the full list of teams." %}</a></li>
16 </p>16 <li><a href="{% url event-list %}">{% trans "You can browse the full list of events." %}</a></li>
17 <li><a href="{% url venue-list %}">{% trans "You can browse the full list of venues." %}</a></li>
18 </ul>
19 <p>{% trans "If you believe the reason you are here is a bug in the LoCo Directory please " %} <a href='https://bugs.launchpad.net/loco-directory'>{% trans "Report it!" %}</a></p>
17</div>20</div>
18 <div class="clear"></div>21 <div class="clear"></div>
19 </div><!-- container -->22 </div><!-- container -->
2023
=== modified file 'loco_directory/templates/base.html'
--- loco_directory/templates/base.html 2010-02-18 19:21:08 +0000
+++ loco_directory/templates/base.html 2010-02-20 12:38:16 +0000
@@ -5,11 +5,8 @@
5<head>5<head>
6 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />6 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
7 <title>{% block title %} {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}</title>7 <title>{% block title %} {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}</title>
8 <link rel="stortcut icon" href="/media/img/favicon.ico" type="image/x-icon" />8 <link rel="shortcut icon" href="/media/img/favicon.ico" type="image/x-icon" />
9 <style type="text/css" media="all">@import "/media/css/style.css";</style>9 <style type="text/css" media="all">@import "/media/css/style.css";</style>
10 <link rel="stylesheet" href="/media/css/teams.css" type="text/css" media="screen" />
11 <link rel="stylesheet" href="/media/css/events.css" type="text/css" media="screen" />
12 <link rel="stylesheet" href="/media/css/venues.css" type="text/css" media="screen" />
13 <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAzr2EBOXUKnm_jVnk0OJI7xSosDVG8KKPE1-m51RBrvYughuyMxQ-i1QfUnH94QxWIa6N4U6MouMmBA" type="text/javascript"></script>10 <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAzr2EBOXUKnm_jVnk0OJI7xSosDVG8KKPE1-m51RBrvYughuyMxQ-i1QfUnH94QxWIa6N4U6MouMmBA" type="text/javascript"></script>
14 <script type="text/javascript">11 <script type="text/javascript">
15 12

Subscribers

People subscribed via source and target branches