Adnane Belmadiaf has proposed merging lp:~adnane002/loco-directory/fix.644409
into lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#644409 Grid layout
https://bugs.launchpad.net/bugs/644409
--
https://code.launchpad.net/~adnane002/loco-directory/fix.644409/+merge/36783
Your team loco-directory-dev is requested to review the proposed merge of
lp:~adnane002/loco-directory/fix.644409 into lp:loco-directory.
=== modified file 'loco_directory/media/css/newstyle.css'
--- loco_directory/media/css/newstyle.css 2010-09-24 22:42:09 +0000
+++ loco_directory/media/css/newstyle.css 2010-09-27 20:26:43 +0000
@@ -9,7 +9,7 @@
*/
#home {
- font-family: UbuntuBeta, Helvetica, Arial, 'Liberation Sans', FreeSans, sans-serif;
+ font-family: 'Ubuntu Beta', UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
}
a {
@@ -265,3 +265,65 @@
}
#page-footer div.container { width: 940px; }
+
+
+
+/*#venue-list ul,*/
+.venue-list{
+ overflow:auto;
+}
+
+
+.venue-list h3 {
+ color: #333;
+ padding: 10px 0px 10px 10px;
+ background: white url(/ubuntu-website/media/images/dotted.png) repeat scroll 0px 0px;
+}
+
+.venue-list ul {
+ display: block;
+ float: left;
+ list-style-image: none;
+ list-style-type: none;
+ padding: 4px 0px 5px 5px;
+ text-indent: 0px;
+ width: 915px;
+ background-color:#F7F7F7;
+}
+
+.venue-list ul li {
+ list-style-image: none;
+ list-style-type: none;
+ text-indent: 0px;
+ width: 200px;
+ margin-right: 22px;
+ margin-bottom: 5px;
+ padding-left: 5px;
+ float: left;
+ font-size:12px;
+}
+
+.venue-list ul li h3{
+ padding: 0px;
+ background:#f7f6f5;
+ margin: 0px;
+ color: #333;
+ padding: 4px 0px;
+}
+
+
+.venue-list ul li p{
+ font-size: 12px;
+ line-height: 16px;
+ margin: 0px;
+ padding: 0px;
+}
+
+.venue-list ul li p a{
+ border-bottom: 1px dotted #333;
+ clear: both;
+ display: block;
+ float: none;
+ padding: 5px 0px 3px;
+}
+
=== modified file 'loco_directory/templates/venues/venue_list.html'
--- loco_directory/templates/venues/venue_list.html 2010-08-21 21:07:34 +0000
+++ loco_directory/templates/venues/venue_list.html 2010-09-27 20:26:43 +0000
@@ -26,47 +26,50 @@
{% for continent in continents %}
{% if continent.related_venues %}
- <h2>{{continent.name}}</h2>
+ <div class="venue-list">
+ <h3>{{continent.name}}</h3>
+ <ul>
{% for country in continent.related_countries %}
{% if country.related_venues %}
- <h3>{{country.name}}</h3>
- <ul>
- {{colcycle.reset}}
+ <li><h3>{{country.name}}</h3>
{% for venue in country.related_venues %}
- <li class="{{colcycle.next}}"><a title="{% trans "show venue details" %}" href="{{ venue.get_absolute_url }}">{{ venue.name }}{% if venue.city %}, {{ venue.city }}{% endif %}</a></li>
+ <p><a title="{% trans "show venue details" %}" href="{{ venue.get_absolute_url }}">{{ venue.name }}{% if venue.city %}, {{ venue.city }}{% endif %}</a></p>
{% endfor %}
- </ul>
- <br style="clear:left;">
+ </li>
{% endif %}
{% endfor %}
+ </ul>
+ </div>
{% endif %}
{% endfor %}
- {% if countries_without_continent_have_venues %}
- <h2>{% trans "Countries without Continent" %}</h3>
+ {% if countries_without_continent_have_venues %}
+ <div class="venue-list">
+ <h3>{% trans "Countries without Continent" %}</h3>
+ <ul>
{% for country in countries_without_continent %}
{% if country.related_venues %}
- <h3>{{country.name}}</h3>
- <ul>
- {{colcycle.reset}}
+ <li><h3>{{country.name}}</h3>
{% for venue in country.related_venues %}
- <li class="{{colcycle.next}}"><a title="{% trans "show venue details" %}" href="{{ venue.get_absolute_url }}">{{ venue.name }}{% if venue.city %}, {{ venue.city }}{% endif %}</a></li>
+ <p><a title="{% trans "show venue details" %}" href="{{ venue.get_absolute_url }}">{{ venue.name }}{% if venue.city %}, {{ venue.city }}{% endif %}</a></p>
{% endfor %}
- </ul>
- <br style="clear:left;">
+ </li>
{% endif %}
{% endfor %}
+ </ul>
+ </div>
{% endif %}
{% if venues_without_country %}
- <h2>{% trans "Venues without Country" %}</h2>
- <ul>
- {{colcycle.reset}}
- {% for venue in venues_without_country %}
- <li class="{{colcycle.next}}"><a title="{% trans "show venue details" %}" href="{{ venue.get_absolute_url }}">{{ venue.name }}{% if venue.city %}, {{ venue.city }}{% endif %}</a></li>
- {% endfor %}
- </ul>
- <br style="clear:left;">
+ <div class="venue-list">
+ <h3>{% trans "Venues without Country" %}</h3>
+ <ul>
+ {% for venue in venues_without_country %}
+ <li>
+ <p><a title="{% trans "show venue details" %}" href="{{ venue.get_absolute_url }}">{{ venue.name }}{% if venue.city %}, {{ venue.city }}{% endif %}</a></p>
+ </li>
+ {% endfor %}
+ </ul>
{% 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
