Chris Johnston has proposed merging lp:~ronnie.vd.c/loco-directory/blog-css
into lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
For more details, see:
https://code.launchpad.net/~ronnie.vd.c/loco-directory/blog-css/+merge/69858
--
https://code.launchpad.net/~ronnie.vd.c/loco-directory/blog-css/+merge/69858
Your team loco-directory-dev is requested to review the proposed merge of
lp:~ronnie.vd.c/loco-directory/blog-css into lp:loco-directory.
=== modified file 'loco_directory/manage.py'
--- loco_directory/manage.py 2009-12-21 11:03:49 +0000
+++ loco_directory/manage.py 2011-07-29 21:01:30 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
from django.core.management import execute_manager
try:
import settings # Assumed to be in the same directory.
=== modified file 'loco_directory/media/css/newstyle.css'
--- loco_directory/media/css/newstyle.css 2011-07-17 11:42:51 +0000
+++ loco_directory/media/css/newstyle.css 2011-07-29 21:01:30 +0000
@@ -590,6 +590,7 @@
line-height:1.2em;
margin: 0.5em 0;
}
+<<<<<<< TREE
.teams-legend {
width:50%;
@@ -625,3 +626,36 @@
margin-right: 5px;
}
+=======
+
+.double-side-content {
+ float: left;
+ margin: 5px 10px;
+ padding: 10px;
+ width: 600px;
+}
+
+.map {
+ min-height: 170px;
+ width: 250px;
+}
+
+/* Blog Styling */
+.blog-entry-image {
+ float: left;
+ height: 40px;
+ padding: 0 8px 8px 0;
+}
+.blog-entry-title {
+ margin-bottom: 0px;
+}
+.blog-entry-author {
+ font-size: 0.75em;
+}
+.blog-entry-text p {
+ text-align:justify;
+ font-size: 0.75em;
+ line-height: 1.4em;
+}
+
+>>>>>>> MERGE-SOURCE
=== modified file 'loco_directory/media/css/twidenash.css'
--- loco_directory/media/css/twidenash.css 2011-03-19 15:04:42 +0000
+++ loco_directory/media/css/twidenash.css 2011-07-29 21:01:30 +0000
@@ -36,3 +36,13 @@
color: #555;
}
+#home .twidenash li {
+ padding: 4px 0;
+}
+#home .twidenash li img {
+ margin-top: 20px;
+}
+#home .twidenash li .nick {
+ margin-left: -60px;
+}
+
=== added file 'loco_directory/media/img/home-map.png'
Binary files loco_directory/media/img/home-map.png 1970-01-01 00:00:00 +0000 and loco_directory/media/img/home-map.png 2011-07-29 21:01:30 +0000 differ
=== modified file 'loco_directory/templates/index.html'
--- loco_directory/templates/index.html 2011-03-18 15:06:54 +0000
+++ loco_directory/templates/index.html 2011-07-29 21:01:30 +0000
@@ -56,37 +56,44 @@
<hr class="divide" />
<br />
-<article class="minor-content">
- <h2><a title="{% trans "Show all Events" %}" href="{% url event-list %}">{% trans "Upcoming Events" %}</a></h2>
- <br />
- {% if global_event_list %}
- <h3>{% trans "Global Events" %}
- <a class="global_event_ical" href="{% url global-event-list-ical %}">
- <img src="/media/images/ical.png" title="{% trans "Global Events as ical" %}"/></a></h3>
-
- <p>{% trans "Select a global event below to see more information about it:" %}</p>
-
- {% include "events/global_event_list.inc.html" %}
-
- {% endif %}
-
- <br />
-
- {% if team_event_count %}
- <h3><a href="{% url event-list %}">{{ team_event_count }} {% trans "Upcoming Team Events" %}</a>
- <a class="teams_event_ical" href="{% url teams-event-list-ical %}">
- <img src="/media/images/ical.png" title="{% trans "Team Events as ical" %}"/></a></h3>
- {% endif %}
-
- {% if team_meeting_count %}
- <h3><a href="{% url meeting-list %}">{{ team_meeting_count }} {% trans "Upcoming Team Meetings" %}</a>
- <a class="teams_meeting_ical" href="{% url teams-meeting-list-ical %}">
- <img src="/media/images/ical.png" title="{% trans "Team Meetings as ical" %}"/></a></h3>
- {% endif %}
+<section class="double-side-content">
+ <h2>Latest blog articles</h2>
+ <article class="blog-entry">
+ <img class="blog-entry-image" src="http://a3.twimg.com/profile_images/1256963985/45032c6a-7c44-4da9-8eb2-cd0caa2ffeec_normal.png"; />
+ <h3 class="blog-entry-title"><a href="#">HTML5 in Sugar</a></h3>
+ <div class="blog-entry-author">Sridhar Dhanapalan</div>
+ <div class="blog-entry-text">
+ <p>In my last blog post, I made the suggestion that Sugar integrate HTML5 more closely to allow for the creation of activities in standard Web technologies. The Karma Project has since been pointed out to me, and the demos look impressive. Unfortunately, its progress looks to have stalled. There is now consideration happening in the community about moving Browse to a WebKit-based alternative, possibly Surf.</p>
+ <p>It seems like now is the time to revisit the notion of integrating HTML5 into Sugar itself. I feel that this can</p>
+ </div>
+ </acticle>
+ <article class="blog-entry">
+ <img class="blog-entry-image" src="http://a3.twimg.com/profile_images/1256963985/45032c6a-7c44-4da9-8eb2-cd0caa2ffeec_normal.png"; />
+ <h3 class="blog-entry-title"><a href="#">Graphics Ninjas invited to help</a></h3>
+ <div class="blog-entry-author">Ubuntu Cloud Portal</div>
+ <div class="blog-entry-text">
+ <p>Are you a graphics ninja ? Are you interested in helping Ubuntu ?</p>
+ <p>If you answered yes to those two questions, youâre invited to help improve cloud.ubuntu.com. The Ubuntu cloud portal needs some graphics love, Iâd like to start adding better graphics that are regularly updated to reflect recent content and events. So youâll be helping the cloud portal shine from a graphics perspective. By contributing youâll get the warm fuzzy feeling of having helped Ubuntu and OpenSource in your own way, weâll be forever grateful and your work will be seen by millions of eyes.</p>
+ </div>
+ </acticle>
+ <article class="blog-entry">
+ <img class="blog-entry-image" src="http://a3.twimg.com/profile_images/1256963985/45032c6a-7c44-4da9-8eb2-cd0caa2ffeec_normal.png"; />
+ <h3 class="blog-entry-title"><a href="#">Plasma Active Updates</a></h3>
+ <div class="blog-entry-author">Sebastian Kügler</div>
+ <div class="blog-entry-text">
+ <p>During the past weeks, weâve been kind of silent around Plasma Active. This doesnât mean weâve just been sitting on our lazy bums, but that weâve poured a lot of work into various aspects of the Plasma Active user experience. Let me details these changes to give you some idea of where we are. But first off, â¦</p>
+ <p>Plasma Active is a KDE project building a touch-friendly user experience for the device spectrum. You can compare it to the KDE Software Compilation, Plasma Active provides a workspace and applications. The first focused target devices are tablets, such as the ExoPC, also known as WeTab. Plasma Active builds on top of KDE frameworks such as the Plasma libraries and the Nepomuk Semantic Desktop, offering a touch-friendly interface taylored to use-cases of the specific device. Components of Plasma Active are re-usable across different devices, bringing many well-known apps to new devices. The user interface used on a specific device can differ across devices, making sure it fits the devices characteristics and use-cases.</p>
+ </div>
+ </acticle>
+</section>
+
+<article class="side-content">
+ <h2>{% trans "Upcoming Events" %}</h2>
+ <a href="{% url event-list %}"><img src="{{ MEDIA_URL }}img/home-map.png" /></a>
</article>
-<article class="minor-content alone">
- <h2>{% trans "Microblogging" %} #locoteams</h2>
+<article class="side-content">
+ <h2>{% trans "Latest social messages" %}</h2>
<div class="twidenash" id="locoteams"></div>
</article>
_______________________________________________
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
![http://a3.twimg.com/profile_images/1256963985/45032c6a-7c44-4da9-8eb2-cd0caa2ffeec_normal.png"](https://a3.twimg.com/profile_images/1256963985/45032c6a-7c44-4da9-8eb2-cd0caa2ffeec_normal.png"){kind=link}