Changeset 2553

Timestamp:

03/01/10 16:16:23 (5 months ago)

Author:

JensDiemer

Message:

• Add SVN Reversion number to package_info page, if exist.
• Activate HeadlineAnchor? on the admin page, too.
• Use lucidTag TOC in package_info admin view.

Location:

branches/0.9/pylucid_project

Files:

• apps/pylucid/templates/admin/base_site.html (modified) (1 diff)
• apps/pylucid_admin/templates/pylucid_admin/base_site.html (modified) (1 diff)
• apps/pylucid_update/templates/pylucid_update/base_site.html (modified) (1 diff)
• media/PyLucid/pylucid_admin.css (modified) (1 diff)
• middlewares/headline_anchor.py (modified) (2 diffs)
• pylucid_plugins/package_info/templates/package_info/admin_package_info.html (modified) (1 diff)
• pylucid_plugins/package_info/templates/package_info/packages_table.html (modified) (1 diff)
• pylucid_plugins/package_info/views.py (modified) (6 diffs)
• pylucid_plugins/TOC/views.py (modified) (1 diff)
• __init__.py (modified) (3 diffs)

branches/0.9/pylucid_project/apps/pylucid/templates/admin/base_site.html

@@ -28 +28 @@
 
 
-{% block branding %}<h1>PyLucid</h1>
+{% block branding %}<a name="top" \><h1 class="admin_headline">PyLucid</h1>
 <!-- page_messages -->
 {% endblock %}

branches/0.9/pylucid_project/apps/pylucid_admin/templates/pylucid_admin/base_site.html

@@ -2 +2 @@
 {% load i18n %}
 
-{% block branding %}<h1>PyLucid admin</h1>
+{% block branding %}<a name="top" \><h1 class="admin_headline">PyLucid admin</h1>
 <!-- page_messages -->
 {% endblock %}

branches/0.9/pylucid_project/apps/pylucid_update/templates/pylucid_update/base_site.html

@@ -2 +2 @@
 {% load i18n %}
 
-{% block branding %}<h1>PyLucid Update
+{% block branding %}<a name="top" \><h1 class="admin_headline">PyLucid Update
 {% if not sites|length_is:"1" %}
-    (site: <strong title="Update on site '{{ site.domain }}'">{{ site.name }}</strong>)
+    <small>(site: <strong title="Update on site '{{ site.domain }}'">{{ site.name }}</strong>)</small>
 {% endif %}
 </h1>

branches/0.9/pylucid_project/media/PyLucid/pylucid_admin.css

@@ -91 +91 @@
     font-weight:bold
 }
+/* ----------------------------------------------------------------------------
+   Headline Anchor
+------------------------------------------------------------------------------- */
+.top_link {
+  color: #000000;
+}
+.uarr {
+  color: #eeeeee;
+}
+.top_link:hover .uarr {
+  color: #000000;
+}
+.section_anchor {
+  text-shadow: 0px 0px #ffffff;
+  text-decoration:none;
+  color: #eeeeee!important;
+  padding-right: 1em;
+}
+.headline_anchor:hover .section_anchor {
+  color: #999999;
+}
+.section_anchor:hover {
+  color:#000000!important;
+  text-decoration:underline;
+  text-shadow: 2px 2px 2px #999999;
+}
+/* ----------------------------------------------------------------------------
+   TOC Plugin
+------------------------------------------------------------------------------- */
+.PyLucidPlugins.TOC {
+  border: 1px solid #eeeeee;
+  background-color: #fefefe;
+  margin: 3em;
+  padding: 1em 0em 1em 0em;
+}
+.PyLucidPlugins.TOC h3 {
+  margin: 0em;
+  color: #333333;
+}
+.PyLucidPlugins.TOC * {
+  margin: 0em;
+  color: #dddddd;
+}
+.PyLucidPlugins.TOC a {
+  color: #777777;
+}
+.PyLucidPlugins.TOC a:hover {
+  color: #286ea0;
+}

branches/0.9/pylucid_project/middlewares/headline_anchor.py

@@ -105 +105 @@
 
         try:
-            pagemeta = request.PYLUCID.pagemeta
-            context = request.PYLUCID.context
-        except AttributeError:
+            # Get the permalink to the current page
+            permalink = request.PYLUCID.context["page_permalink"]
+        except AttributeError, KeyError:
+            # We are not on a cms page -> e.g.: in the admin pandel
             # No cms page request -> do nothing
             #print "*** No request.PYLUCID.pagemeta!", response._headers["content-type"]
-            return response
+            permalink = request.path
 
         # response is a HttpResponse object. Get the content via response.content will
         # encode it to byte string, but we need unicode.
         content = force_unicode(response.content, encoding=response._charset)
-
-        # Get the permalink to the current page
-        permalink = request.PYLUCID.context["page_permalink"]
-#        permalink = pagemeta.get_permalink()
 
         # insert the Headline links
@@ -126 +123 @@
         if settings.PYLUCID.TOC_PLACEHOLDER in content:
             # lucidTag TOC is in the content -> insert a table of contents
-            toc_min_count = request.PYLUCID.context["toc_min_count"]
+            toc_min_count = request.PYLUCID._toc_min_count # Added in lucidTag TOC
             toc_html = headline_anchor.build_toc(toc_min_count)
             content = content.replace(settings.PYLUCID.TOC_PLACEHOLDER, toc_html)

branches/0.9/pylucid_project/pylucid_plugins/package_info/templates/package_info/admin_package_info.html

@@ -2 +2 @@
 
 {% block content %}
-{% comment %}
-        {% lucidTag TOC %} <- FIXME: TOC doesn't work in admin panel
-{% endcomment %}
+{% lucidTag TOC %}
 {% lucidTag package_info all_packages=True display_version=True display_location=True %}
 {% endblock %}

branches/0.9/pylucid_project/pylucid_plugins/package_info/templates/package_info/packages_table.html

@@ -16 +16 @@
         <dl>
                 {% if display_version %}
-            <dt>version:</dt><dd>{{ entry.version }}</dd>
+            <dt>{% trans "version" %}:</dt><dd>{{ entry.version }}</dd>
             {% endif %}
         
             {% if display_location or user.is_superuser %}
-            <dt>filesystem location:</dt>
+            <dt>{% trans "filesystem location" %}:</dt>
             <dd>{{ entry.location }}</dd>
             {% endif %}
         
             {% if entry.author %}
-            <dt>author:</dt><dd>{{ entry.author }}</dd>
+            <dt>{% trans "author" %}:</dt><dd>{{ entry.author }}</dd>
             {%  endif %}
         
             {% if entry.home_page %}
-            <dt>homepage:</dt>
+            <dt>{% trans "homepage" %}:</dt>
             <dd><a href="{{ entry.home_page }}">{{ entry.home_page }}</a></dd>
             {%  endif %}
         
             {% if entry.license and entry.license != "UNKNOWN" %}
-            <dt>license:</dt>
+            <dt>{% trans "license" %}:</dt>
             <dd>
                 {% if entry.license_url %}<a href="{{ entry.license_url }}">{% endif %}

branches/0.9/pylucid_project/pylucid_plugins/package_info/views.py

@@ -20 +20 @@
 __version__ = "$Rev:$"
 
+import os
+
 if __name__ == "__main__":
-    import os
     os.environ['DJANGO_SETTINGS_MODULE'] = "pylucid_project.settings"
     virtualenv_file = "../../../../../bin/activate_this.py"
@@ -31 +32 @@
 from django.conf import settings
 from django.template import mark_safe
+from django.utils.version import get_svn_revision
 
 from pylucid_project import PYLUCID_VERSION_STRING
@@ -36 +38 @@
 
 # print (!) some debug info. Values can be: False, 1, 2
-DEBUG = 1
+DEBUG = False
 
 # Collect only information about these packages:
@@ -105 +107 @@
 
 
+
 class PackageInfo(dict):
     " Holds all package information for *one* package "
@@ -113 +116 @@
         self._fill_with_dist_attr()
         self._fill_with_pkg_info()
+        self._add_svn_reversion()
 
     def _fill_with_dist_attr(self):
@@ -174 +178 @@
 
             dict.__setitem__(self, dict_key, pkg_info_value)
+
+    def _add_svn_reversion(self):
+        """ Add Subverion reversion number to version string, if exist """
+        location = dict.get(self, "location")
+        svn_revision = get_svn_revision(location)
+        if svn_revision == "SVN-unknown":
+            return
+
+        if svn_revision not in self["version"]:
+            self["version"] += " %s" % svn_revision
 
 

branches/0.9/pylucid_project/pylucid_plugins/TOC/views.py

@@ -48 +48 @@
     # The real work would be done in:
     # pylucid_project.middlewares.headline_anchor.HeadlineAnchorMiddleware
-    request.PYLUCID.context["toc_min_count"] = min
+    request.PYLUCID._toc_min_count = min
     return settings.PYLUCID.TOC_PLACEHOLDER
 

branches/0.9/pylucid_project/__init__.py

@@ -14 +14 @@
     $Author$
 
-    :copyleft: 2009 by the PyLucid team, see AUTHORS for more details.
+    :copyleft: 2009-2010 by the PyLucid team, see AUTHORS for more details.
     :license: GNU GPL v3 or above, see LICENSE for more details.
 """
+
+import os
 
 try:
@@ -23 +25 @@
     svn_revision = ""
 else:
-    svn_revision = get_svn_revision(".")
-    if svn_revision == u'SVN-unknown':
-        svn_revision = ""
-    else:
-        # Add a space between the normal version number
-        # and the SVN revision number.
-        svn_revision = " (%s)" % svn_revision
+    path = os.path.split(os.path.abspath(__file__))[0]
+    svn_revision = get_svn_revision(path)
 
 __version__ = (0, 9, 0, 'beta', svn_revision)
@@ -38 +35 @@
 # - No spaces: "0.8.0 RC2" -> "0.8.0RC2"
 # http://peak.telecommunity.com/DevCenter/setuptools#specifying-your-project-s-version
-PYLUCID_VERSION_STRING = "%s.%s.%s%s%s" % __version__
+PYLUCID_VERSION_STRING = "%s.%s.%s%s.%s" % __version__
 
 
+if __name__ == "__main__":
+    print PYLUCID_VERSION_STRING