Paul Tagliamonte has proposed merging lp:~paultag/loco-directory/bug-622717
into lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#622717 Error needs to stand out more on edit team details
https://bugs.launchpad.net/bugs/622717
* CSS Fixes in all CSS files ( except what looks to be a factory jQuery CSS
file )
* Added CSS for the errors on the forms
* Removed one stray href ending tag
* Removed one space between error and it's plural
--
https://code.launchpad.net/~paultag/loco-directory/bug-622717/+merge/35578
Your team loco-directory-dev is requested to review the proposed merge of
lp:~paultag/loco-directory/bug-622717 into lp:loco-directory.
=== modified file 'loco_directory/media/css/continents.css'
--- loco_directory/media/css/continents.css 2010-08-17 15:09:14 +0000
+++ loco_directory/media/css/continents.css 2010-09-15 20:11:19 +0000
@@ -1,72 +1,73 @@
/* Continents */
ul#continents {
list-style: none;
- background: url(../images/map.png) no-repeat 0 0;
- position: relative;
- width: 580px;
- height: 268px;
- margin: 0 auto;
- padding: 0;
+ background: url(../images/map.png) no-repeat 0px 0px;
+ position: relative;
+ width: 580px;
+ height: 268px;
+ margin: 0px auto;
+ padding: 0;
}
ul#continents li {
- position: absolute;
+ position: absolute;
}
ul#continents li a{
- display: block;
- height: 100%;
+ display: block;
+ height: 100%;
+
text-decoration: none;
}
#northamerica {
- width: 227px;
- height: 142px;
- top: 2px;
- left: 0px;
+ width: 227px;
+ height: 142px;
+ top: 2px;
+ left: 0px;
}
#southamerica {
- width: 108px;
- height: 130px;
- top: 131px;
- left: 76px;
+ width: 108px;
+ height: 130px;
+ top: 131px;
+ left: 76px;
}
#africa {
- width: 120px;
- height: 140px;
- top: 83px;
- left: 209px;
+ width: 120px;
+ height: 140px;
+ top: 83px;
+ left: 209px;
}
#europe {
- width: 120px;
- height: 84px;
- top: 1px;
- left: 211px;
+ width: 120px;
+ height: 84px;
+ top: 1px;
+ left: 211px;
}
#asia {
- width: 215px;
- height: 175px;
- top: 1px;
- left: 283px;
+ width: 215px;
+ height: 175px;
+ top: 1px;
+ left: 283px;
}
#australia {
- width: 114px;
- height: 95px;
- top: 152px;
- left: 432px;
+ width: 114px;
+ height: 95px;
+ top: 152px;
+ left: 432px;
}
ul#continents li a:hover {
- background: url(../images/map.png) no-repeat 0 0;
+ background: url(../images/map.png) no-repeat 0px 0px;
}
ul#continents li#northamerica a:hover {
- background-position: 0 -270px;
+ background-position: 0px -270px;
}
ul#continents li#southamerica a:hover {
@@ -90,35 +91,36 @@
}
ul#continents li a span {
- display: none;
- text-align:left;
-}
-
-ul#continents li a:hover span {
- display: block;
-}
-
-ul#continents li a:hover span {
- display: block;
- padding: 5px;
- width: 200px;
+ display: none;
+ text-align: left;
+}
+
+ul#continents li a:hover span {
+ display: block;
+}
+
+ul#continents li a:hover span {
+ display: block;
+ padding: 5px;
+ width: 200px;
background: #000;
- position: relative;
- top: 68%;
- font-size: 11px;
- opacity: .75;
- filter:alpha(opacity=75);
- color: #FFF;
- border-radius: 4px;
- -moz-border-radius: 4px;
+ position: relative;
+ top: 68%;
+ font-size: 11px;
+ opacity: .75;
+ filter: alpha(opacity=75);
+ color: #FFF;
+
+ border-radius: 4px;
+ -moz-border-radius: 4px;
-webkit-border-radius: 4px;
}
ul#continents li a:hover span strong {
- display: block;
- margin-bottom: 2px;
- font-size: 12px;
- color:white;
+ display: block;
+ margin-bottom: 2px;
+ font-size: 12px;
+ color: white;
text-decoration: underline;
}
=== modified file 'loco_directory/media/css/newstyle.css'
--- loco_directory/media/css/newstyle.css 2010-09-02 00:04:02 +0000
+++ loco_directory/media/css/newstyle.css 2010-09-15 20:11:19 +0000
@@ -3,191 +3,252 @@
}
a {
- color: #DD4814;
+ color: #DD4814;
}
a:visited {
- color: #b12a10;
+ color: #b12a10;
}
th.form-item-label {
vertical-align: top;
}
label {
- font-weight: bold;
- white-space: nowrap;
+ font-weight: bold;
+ white-space: nowrap;
}
#venue-map-selector {
- width: 400px;
- height: 300px;
- border: 1px solid #ccc;
- position: absolute;
- right: 30px;
- top: 40px;
+ width: 400px;
+ height: 300px;
+ border: 1px solid #ccc;
+ position: absolute;
+ right: 30px;
+ top: 40px;
}
#venue-map {
- width: 400px;
- border: 1px solid #CCC;
- bottom: 10px;
- float: right;
- height: 300px;
- margin-right: 10px;
+ width: 400px;
+ border: 1px solid #CCC;
+ bottom: 10px;
+ float: right;
+ height: 300px;
+ margin-right: 10px;
}
#main-content {
- margin-right: 20px;
- }
- li.col_left {
- float: left;
- width: 45%;
- clear: left;
- }
- li.col_right {
- float: right;
- width: 45%;
- clear: right;
- }
- li.approved {
- list-style-image: url(../img/approved.png);
- }
- li.unapproved {
- list-style-image: url(../img/unapproved.png);
- }
- br.clear {
- clear: left;
- }
- #main-content .object-detail {
- -moz-border-radius: 15px;
- -webkit-border-radius: 15px;
- border:2px solid #ccc;
- border-bottom:4px solid #bbb;
- border-right:4px solid #bbb;
- border-top:2px solid #ddd;
- min-height: 500px;
- text-align: left;
- }
- #main-content .object-detail #options-left ul {
- position: relative;
- left: -60px;
- }
- #main-content .object-detail #options-right ul {
- position: relative;
- }
- #main-content .object-detail #options-left li {
- float: left;
- margin-left: 5px;
- display: inline;
- }
- #main-content .object-detail #options-right li {
- float: right;
- margin-right: 5px;
- text-align: right;
- display: inline;
- }
+ margin-right: 20px;
+}
+
+li.col_left {
+ float: left;
+ width: 45%;
+ clear: left;
+}
+
+li.col_right {
+ float: right;
+ width: 45%;
+ clear: right;
+}
+
+li.approved {
+ list-style-image: url(../img/approved.png);
+}
+
+li.unapproved {
+ list-style-image: url(../img/unapproved.png);
+}
+
+br.clear {
+ clear: left;
+}
+
+#main-content .object-detail {
+ -moz-border-radius: 15px;
+ -webkit-border-radius: 15px;
+
+ border: 2px solid #ccc;
+ border-bottom: 4px solid #bbb;
+ border-right: 4px solid #bbb;
+ border-top: 2px solid #ddd;
+ min-height: 500px;
+ text-align: left;
+}
+
+#main-content .object-detail #options-left ul {
+ position: relative;
+ left: -60px;
+}
+
+#main-content .object-detail #options-right ul {
+ position: relative;
+}
+
+#main-content .object-detail #options-left li {
+ float: left;
+ margin-left: 5px;
+ display: inline;
+}
+
+#main-content .object-detail #options-right li {
+ float: right;
+ margin-right: 5px;
+ text-align: right;
+ display: inline;
+}
- #main-content .object-detail .option {
- width: 32px;
- height: 32px;
- display: block;
- text-decoration: none;
- }
- #main-content .object-detail a.goback {
- background: transparent url('../img/goback.png') no-repeat scroll top right;
- }
- #main-content .object-detail a.edit {
- background: transparent url('../img/edit.png') no-repeat scroll top right;
- }
- #main-content .object-detail a.delete {
- background: transparent url('../img/delete.png') no-repeat scroll top right;
- }
-
- #main-content .object-detail a.add-team-event {
- background: transparent url('../img/new_event.png') no-repeat scroll top right;
- }
- #main-content .object-detail a.add-comment {
- background: transparent url('../img/comment.png') no-repeat scroll top right;
- }
- .resource {
- width: 32px;
- height: 32px;
- padding: 2px;
- margin-top: 4px;
- margin-bottom: 3px;
- float: left;
- border: 1px white solid;
- }
- #main-content .resource:hover {
- border: 1px #eee solid;
- }
-
- #page-footer .container div.copyright {
- font-size:0.75em;
- line-height:1.5em;
- }
-
- #page-footer .container div.loggedin {
- font-size:0.75em;
- line-height:1.5em;
- float:left;width :400px;
- margin-bottom:10px;
- margin-top:5px;
- }
-
- #page-footer .container div.lang_switcher {
- font-size:0.75em;
- line-height:1.5em;
- float:right;
- width :500px;
- margin-bottom:10px;
- margin-top:5px;
- margin-right: 14px;
- }
+#main-content .object-detail .option {
+ width: 32px;
+ height: 32px;
+ display: block;
+ text-decoration: none;
+}
+
+#main-content .object-detail a.goback {
+ background: transparent url('../img/goback.png') no-repeat scroll top right;
+}
+
+#main-content .object-detail a.edit {
+ background: transparent url('../img/edit.png') no-repeat scroll top right;
+}
+
+#main-content .object-detail a.delete {
+ background: transparent url('../img/delete.png') no-repeat scroll top right;
+}
+
+#main-content .object-detail a.add-team-event {
+ background: transparent url('../img/new_event.png') no-repeat scroll top right;
+}
+
+#main-content .object-detail a.add-comment {
+ background: transparent url('../img/comment.png') no-repeat scroll top right;
+}
+
+.resource {
+ width: 32px;
+ height: 32px;
+ padding: 2px;
+ margin-top: 4px;
+ margin-bottom: 3px;
+ float: left;
+ border: 1px white solid;
+}
+
+#main-content .resource:hover {
+ border: 1px #eee solid;
+}
+
+#page-footer .container div.copyright {
+ font-size: 0.75em;
+ line-height: 1.5em;
+}
+
+#page-footer .container div.loggedin {
+ font-size: 0.75em;
+ line-height: 1.5em;
+ float: left;
+ width: 400px;
+ margin-bottom: 10px;
+ margin-top: 5px;
+}
+
+#page-footer .container div.lang_switcher {
+ font-size: 0.75em;
+ line-height: 1.5em;
+ float: right;
+ width: 500px;
+ margin-bottom: 10px;
+ margin-top: 5px;
+ margin-right: 14px;
+}
.team-event-nav {
- border-bottom: 1px gray solid;
- list-style: none;
- padding: 1px 0px 1px 5px;
- margin: 5px 0px 5px 0px;
+ border-bottom: 1px gray solid;
+ list-style: none;
+ padding: 1px 0px 1px 5px;
+ margin: 5px 0px 5px 0px;
}
.team-event-nav li {
- list-style: none;
- margin: -1px 2px 0 3px;
- padding: 0px;
- display: inline;
+ list-style: none;
+ margin: -1px 2px 0px 3px;
+ padding: 0px;
+ display: inline;
}
.message .content-shim {
- margin: 0px; /* buffer the bulb in */
- padding: 5px; /* un-suck the text */
- background-repeat: no-repeat;
- background-image: url(../img/infobox-icon.png);
- padding-left: 30px; /* infobox icon is 22x22 */
+ margin: 0px; /* buffer the bulb in */
+ padding: 5px; /* un-suck the text */
+ background-repeat: no-repeat;
+ background-image: url(../img/infobox-icon.png);
+ padding-left: 30px; /* infobox icon is 22x22 */
}
.message {
- width: 70%;
- margin-left: auto;
- margin-right: auto;
- background-color: #FFFFB6;
- border-radius: 0px;
- box-shadow: 0px 1px 1px #FFE4B6;
+ width: 70%;
+ margin-left: auto;
+ margin-right: auto;
+ background-color: #FFFFB6;
+ border-radius: 0px;
+ box-shadow: 0px 1px 1px #FFE4B6;
}
.message { /* noncss 3. XXX: remove me in 20 years. */
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
- -moz-box-shadow: 0px 0px 1px #FFE4B6;
- -webkit-box-shadow: 0px 0px 1px #FFE4B6;
-}
+ -webkit-border-radius: 8px;
+ -moz-border-radius: 8px;
+ -moz-box-shadow: 0px 0px 1px #FFE4B6;
+ -webkit-box-shadow: 0px 0px 1px #FFE4B6;
+}
+
+/* UI Errors */
+
+ul.errorlist {
+ margin: 0px;
+ padding: 0px;
+}
+
+.errorlist li {
+ color: red;
+ font-weight: bold;
+ display: block;
+ font-size: 1.1em;
+ margin: 0px 0px 3px;
+ padding: 4px 5px;
+}
+
/* Flickr Feed for Global Event*/
-.thumbs { margin: 0; padding: 0; overflow: hidden; }
-.thumbs li { list-style: none; float: left; margin: 5px; padding: 3px; background: #eee; -moz-box-shadow: 0 0 4px #444; -webkit-box-shadow: 0 0 2px #000; }
-.thumbs li a { }
-.thumbs li img { display: block; }
+.thumbs {
+ margin: 0px;
+ padding: 0px;
+ overflow: hidden;
+}
+
+.thumbs li {
+ list-style: none;
+ float: left;
+ margin: 5px;
+ padding: 3px;
+ background: #eee;
+ -moz-box-shadow: 0px 0px 4px #444;
+ -webkit-box-shadow: 0px 0px 2px #000;
+}
+
+.thumbs li a { }
+.thumbs li img { display: block; }
.thumbs li a img { border: none;}
/* 960px header and footer */
-header#page-header { width: 960px; margin: 0 auto; padding: 0 10px; position:relative; }
-footer#page-footer { width: 960px; margin: 0 auto; padding: 0 10px; position:relative; }
+header#page-header {
+ width: 960px;
+ margin: 0px auto;
+ padding: 0px 10px;
+ position: relative;
+}
+
+footer#page-footer {
+ width: 960px;
+ margin: 0px auto;
+ padding: 0px 10px;
+ position: relative;
+}
+
#page-footer div.container { width: 940px; }
=== modified file 'loco_directory/media/css/twidenash.css'
--- loco_directory/media/css/twidenash.css 2010-09-08 00:00:32 +0000
+++ loco_directory/media/css/twidenash.css 2010-09-15 20:11:19 +0000
@@ -1,21 +1,21 @@
ul.twidenash li {
- list-style-type: none;
- clear: both;
- padding: 3px;
- font-size: 100%;
+ list-style-type: none;
+ clear: both;
+ padding: 3px;
+ font-size: 100%;
}
ul.twidenash li img {
- float: left;
- vertical-align: top;
- padding-right: 10px;
+ float: left;
+ vertical-align: top;
+ padding-right: 10px;
}
ul.twidenash li .comment {
- margin-left: 5px;
- display: block;
- overflow: auto;
+ margin-left: 5px;
+ display: block;
+ overflow: auto;
}
ul.twidenash li .nick {
- font-weight: bold;
+ font-weight: bold;
}
=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html 2010-09-13 19:07:26 +0000
+++ loco_directory/templates/teams/team_detail.html 2010-09-15 20:11:19 +0000
@@ -174,7 +174,7 @@
{% if team.flickr_id %}
<article class="minor-content alone" style="width:95%;">
- <h2>{% trans "Photos from" %} {{ team.name }}</a></h2>
+ <h2>{% trans "Photos from" %} {{ team.name }}</h2>
<div style="width:100%;" id="flickr"> </div>
</article>
{% endif %}
=== modified file 'loco_directory/templates/teams/team_update.html'
--- loco_directory/templates/teams/team_update.html 2010-08-21 21:07:34 +0000
+++ loco_directory/templates/teams/team_update.html 2010-09-15 20:11:19 +0000
@@ -13,7 +13,7 @@
<article id="form" class="main-content">
{% if form.errors %}
<p style="color: red;">
- {% trans "Please correct the error" %} {{ form.errors|pluralize }} below.
+ {% trans "Please correct the error" %}{{ form.errors|pluralize }} below.
</p>
{% endif %}
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
