Permalink
Browse files

merged

  • Loading branch information...
2 parents e9c0e74 + 04642c6 commit b8bd48a00208b82302f8d9b9249df158b9cebb70 @evildmp committed Jun 2, 2012
View
@@ -5,9 +5,9 @@ Documentation & support
Documentation is in progress; what exists can be found at http://readthedocs.org/docs/arkestra/.
-email list and archives: http://groups.google.com/group/django-arkestra
-
-IRC: #arkestra on irc.freenode.net
+* website: http://arkestra-project.org
+* email list and archives: http://groups.google.com/group/django-arkestra
+* IRC: #arkestra on irc.freenode.net
Relationship with django CMS
****************************
@@ -45,9 +45,9 @@ Arkestra currently publishes the website of Cardiff University School of Medicin
160 entities (i.e. parts of the organisation), as well as
330 news articles and 570 events.
-It also publishes over 1000 pages.
+It also publishes over 10000 pages, around 90% of which are published automatically by the system.
-All this information is managed by a team of over 60 web editors.
+All this information is managed by a team of over 40 web editors.
In other words it is suited to the needs of large organisations; it's robust and performs well.
@@ -56,8 +56,8 @@ Smaller projects
It also works well for much smaller projects, its core concepts scale up and down effectively. Two much smaller sites using Arkestra include:
-http://aikidocardiff.com/
-http://thelaugharneweekend.com/
+* http://aikidocardiff.com/
+* http://thelaugharneweekend.com/
Work to be done
***************
@@ -44,11 +44,10 @@
{% if item.show_author %}<span class="image_author text">(Author: {{ item.image.author }})</span>{% endif %}
{% if imageset.items_have_links %}
- {% if item.link_title or item.link_description or item.image_caption %}
- <span class="more-information">Read more<span class="hide"> about {{ item.link_title|default:item.text }}</span>...</span>
- {% else %}
- <span class="link-arrow"></span>
+ {% if item.link_title or item.link_description %}
+ <span class="hide">{{ item.link_title|default:item.text }}</span>
{% endif %}
+ <span class="link-arrow"></span>
{% endif %}
</a>
{% endif %}
@@ -10,6 +10,24 @@
display: block;
}
+/* ================ all single imagesets =============== */
+
+/* span.imageset.image
+ a
+ img.plugin
+ span.image-title.text
+ span.image-description.text
+ span.link-title.text
+ span.link-description.text
+ span.more-information
+ span.hide
+ span.link-arrow (if no span.more-information)
+*/
+
+span.imageset.image {
+ display: inline-block; /* because otherwise a block, that could get too wide */
+}
+
/* ================ all multiple imagesets =============== */
/* ul.imageset
@@ -255,6 +273,7 @@ img.right {float: right; margin-left: 1em; margin-bottom: .5em;}
a img {border: none;}
span.image {display: block; clear: both;}
+span.image span.image-caption {display: block;}
/* styles available to the presentation editor */

0 comments on commit b8bd48a

Please sign in to comment.