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

[Thomas Bechtold]

[Daniel Holbach (dholbach)]

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

[Daniel Holbach (dholbach)]

review: Needs Fixing

[lp:~toabctl/loco-team-portal/fixes-523709]

66. By Thomas Bechtold on 2010-02-20

fix urls for events and venues

67. By Thomas Bechtold on 2010-02-20

add . at the end of sentences

[Thomas Bechtold (toabctl)]

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

[Daniel Holbach (dholbach)]

Good work!

review: Approve

=== 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 @@
 }
 
 
+/* Stuff for the 3Dbox */
+.box {
+	background: #edf5e1;
+	padding: 10px 20px 10px;
+	position: relative;
+	border-top: solid 2px #c4df9b;
+}
+
+.dbox {
+  position: absolute;
+  padding: 0px;
+  z-index: 0;
+}
+
+.vert {
+  top: 0px;
+  height: 100%;
+  background-repeat: repeat-y;
+}
+
+.box-left {
+  background-image: url(../img/box/left.png); 
+  left: -10px;
+  width: 24px;
+}
+
+.box-right {
+  background-image: url(../img/box/right.png);
+  right: -10px;
+  width: 34px;
+  
+}
+
+.horz {
+  left: 0px;
+  width: 100%;
+  background-repeat: repeat-x;
+}
+
+.box-top {
+  background-image: url(../img/box/top.png);
+  top: -10px;
+  height: 24px;
+}
+
+.box-bottom {
+  background-image: url(../img/box/bottom.png);
+  bottom: -10px;
+  height: 34px;
+}
+
+.box-top-left {
+  background-image: url(../img/box/top-left.png);
+  top: -10px;
+  left: -10px;
+  height: 24px;
+  width: 24px;
+}
+
+.box-top-right {
+  background-image: url(../img/box/top-right.png);
+  top: -10px;
+  right: -10px;
+  height: 24px;
+  width: 34px;
+}
+
+.box-bottom-left {
+  background-image: url(../img/box/bottom-left.png);
+  bottom: -10px;
+  left: -10px;
+  height: 34px;
+  width: 24px;
+}
+
+.box-bottom-right {
+  background-image: url(../img/box/bottom-right.png);
+  bottom: -10px;
+  right: -10px;
+  height: 34px;
+  width: 34px;
+}
+
+

=== 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 @@
 /*
  * This CSS file is used to all pages dealing with Events
  */
-
-.box {
-	background: #edf5e1;
-	padding: 10px 20px 10px;
-	position: relative;
-	border-top: solid 2px #c4df9b;
-}
-
 th[scope="row"] {
   text-align: right;
   border: 0px solid red;
@@ -112,79 +104,3 @@
   background-image: url(../img/edit-delete.png)
 }
 
-.dbox {
-  position: absolute;
-  padding: 0px;
-  z-index: 0;
-}
-
-.vert {
-  top: 0px;
-  height: 100%;
-  background-repeat: repeat-y;
-}
-
-.box-left {
-  background-image: url(../img/box/left.png); 
-  left: -10px;
-  width: 24px;
-}
-
-.box-right {
-  background-image: url(../img/box/right.png);
-  right: -10px;
-  width: 34px;
-  
-}
-
-.horz {
-  left: 0px;
-  width: 100%;
-  background-repeat: repeat-x;
-}
-
-.box-top {
-  background-image: url(../img/box/top.png);
-  top: -10px;
-  height: 24px;
-}
-
-.box-bottom {
-  background-image: url(../img/box/bottom.png);
-  bottom: -10px;
-  height: 34px;
-}
-
-.box-top-left {
-  background-image: url(../img/box/top-left.png);
-  top: -10px;
-  left: -10px;
-  height: 24px;
-  width: 24px;
-}
-
-.box-top-right {
-  background-image: url(../img/box/top-right.png);
-  top: -10px;
-  right: -10px;
-  height: 24px;
-  width: 34px;
-}
-
-.box-bottom-left {
-  background-image: url(../img/box/bottom-left.png);
-  bottom: -10px;
-  left: -10px;
-  height: 34px;
-  width: 24px;
-}
-
-.box-bottom-right {
-  background-image: url(../img/box/bottom-right.png);
-  bottom: -10px;
-  right: -10px;
-  height: 34px;
-  width: 34px;
-}
-
-

=== 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 @@
 @import "common.css";
 @import "layout.css";
 @import "teams.css";
+@import "venues.css";
+@import "events.css";
 
 body {
 	background-image: url(../img/bgrepeat.jpg);

=== 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 @@
 /*
  * This CSS file is used to all pages dealing with Teams
  */
-
-.box {
-	background: #edf5e1;
-	padding: 10px 20px 10px;
-	position: relative;
-	border-top: solid 2px #c4df9b;
-}
-
 .box .delete {
 	position: absolute;
 	top: 10px;
@@ -190,80 +182,3 @@
   width: 100%;
   height: 90px;
 }
-
-.dbox {
-  position: absolute;
-  padding: 0px;
-  z-index: 0;
-}
-
-.vert {
-  top: 0px;
-  height: 100%;
-  background-repeat: repeat-y;
-}
-
-.box-left {
-  background-image: url(../img/box/left.png); 
-  left: -10px;
-  width: 24px;
-}
-
-.box-right {
-  background-image: url(../img/box/right.png);
-  right: -10px;
-  width: 34px;
-  
-}
-
-.horz {
-  left: 0px;
-  width: 100%;
-  background-repeat: repeat-x;
-}
-
-.box-top {
-  background-image: url(../img/box/top.png);
-  top: -10px;
-  height: 24px;
-}
-
-.box-bottom {
-  background-image: url(../img/box/bottom.png);
-  bottom: -10px;
-  height: 34px;
-}
-
-.box-top-left {
-  background-image: url(../img/box/top-left.png);
-  top: -10px;
-  left: -10px;
-  height: 24px;
-  width: 24px;
-}
-
-.box-top-right {
-  background-image: url(../img/box/top-right.png);
-  top: -10px;
-  right: -10px;
-  height: 24px;
-  width: 34px;
-}
-
-.box-bottom-left {
-  background-image: url(../img/box/bottom-left.png);
-  bottom: -10px;
-  left: -10px;
-  height: 34px;
-  width: 24px;
-}
-
-.box-bottom-right {
-  background-image: url(../img/box/bottom-right.png);
-  bottom: -10px;
-  right: -10px;
-  height: 34px;
-  width: 34px;
-}
-
-

=== 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 @@
 /*
  * This CSS file is used to all pages dealing with Events
  */
-
-.box {
-	background: #edf5e1;
-	padding: 10px 20px 10px;
-	position: relative;
-	border-top: solid 2px #c4df9b;
-}
-
 th[scope="row"] {
   text-align: right;
   border: 0px solid red;
@@ -67,79 +59,3 @@
   background-image: url(../img/edit-team.png)
 }
 
-.dbox {
-  position: absolute;
-  padding: 0px;
-  z-index: 0;
-}
-
-.vert {
-  top: 0px;
-  height: 100%;
-  background-repeat: repeat-y;
-}
-
-.box-left {
-  background-image: url(../img/box/left.png); 
-  left: -10px;
-  width: 24px;
-}
-
-.box-right {
-  background-image: url(../img/box/right.png);
-  right: -10px;
-  width: 34px;
-  
-}
-
-.horz {
-  left: 0px;
-  width: 100%;
-  background-repeat: repeat-x;
-}
-
-.box-top {
-  background-image: url(../img/box/top.png);
-  top: -10px;
-  height: 24px;
-}
-
-.box-bottom {
-  background-image: url(../img/box/bottom.png);
-  bottom: -10px;
-  height: 34px;
-}
-
-.box-top-left {
-  background-image: url(../img/box/top-left.png);
-  top: -10px;
-  left: -10px;
-  height: 24px;
-  width: 24px;
-}
-
-.box-top-right {
-  background-image: url(../img/box/top-right.png);
-  top: -10px;
-  right: -10px;
-  height: 24px;
-  width: 34px;
-}
-
-.box-bottom-left {
-  background-image: url(../img/box/bottom-left.png);
-  bottom: -10px;
-  left: -10px;
-  height: 34px;
-  width: 24px;
-}
-
-.box-bottom-right {
-  background-image: url(../img/box/bottom-right.png);
-  bottom: -10px;
-  right: -10px;
-  height: 34px;
-  width: 34px;
-}
-
-

=== 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 @@
 
 
 <div class="main">
-  <h2><a href="{% url team-list %}">{% trans "You can browse the full list of teams" %}</a></h2>
-    <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>
+        <ul>
+                <li><a href="{% url team-list %}">{% trans "You can browse the full list of teams." %}</a></li>
+                <li><a href="{% url event-list %}">{% trans "You can browse the full list of events." %}</a></li>
+                <li><a href="{% url venue-list %}">{% trans "You can browse the full list of venues." %}</a></li>
+        </ul>
+        <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>
 </div>
   <div class="clear"></div>
  </div><!-- container -->

=== 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 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
   <title>{% block title %} {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}</title>
-  <link rel="stortcut icon" href="/media/img/favicon.ico" type="image/x-icon" />
+  <link rel="shortcut icon" href="/media/img/favicon.ico" type="image/x-icon" />
   <style type="text/css" media="all">@import "/media/css/style.css";</style>
-  <link rel="stylesheet" href="/media/css/teams.css" type="text/css" media="screen" />  
-  <link rel="stylesheet" href="/media/css/events.css" type="text/css" media="screen" />  
-  <link rel="stylesheet" href="/media/css/venues.css" type="text/css" media="screen" /> 
   <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAzr2EBOXUKnm_jVnk0OJI7xSosDVG8KKPE1-m51RBrvYughuyMxQ-i1QfUnH94QxWIa6N4U6MouMmBA" type="text/javascript"></script>
     <script type="text/javascript">