diff --git a/browser/concept_macros.pt b/browser/concept_macros.pt index 3c700bc..d0adbad 100644 --- a/browser/concept_macros.pt +++ b/browser/concept_macros.pt @@ -230,7 +230,7 @@ - - +
+ fixedType view/fixedType; + langInfo view/languageInfo; + language langInfo/language">
- Versioning + Versioning + + + + + + - + Version: 1.1 (current, released) diff --git a/browser/lobo/configure.zcml b/browser/lobo/configure.zcml index d179e44..5bf7ea0 100644 --- a/browser/lobo/configure.zcml +++ b/browser/lobo/configure.zcml @@ -39,6 +39,14 @@ factory="loops.browser.lobo.standard.List1" permission="zope.View" /> + +

- +
@@ -43,6 +43,16 @@ + + +
+ +
+ + + +
@@ -83,7 +93,8 @@ style cell/style">
- + +
- +
@@ -104,11 +115,10 @@ - + title python: cell.img['description'] or cell.img['title']"> -
- +
+  
diff --git a/browser/lobo/standard.py b/browser/lobo/standard.py index 7dcb317..fb8e1aa 100644 --- a/browser/lobo/standard.py +++ b/browser/lobo/standard.py @@ -144,6 +144,7 @@ class ConceptView(BaseConceptView): adImg = adapted(r) showInfo = adImg.showInfo and adImg.metaInfo return dict(src=src, fullImageUrl=fullSrc, title=r.title, + description=r.description, url=url, cssClass=self.parentView.imageCssClass, showInfo=showInfo) @@ -245,6 +246,13 @@ class List2(BasePart): gridPattern = [['span-4 clear', 'span-2 last']] +class List3(BasePart): + + macroName = 'list3' + imageSize = 'large' + gridPattern = [['span-6 clear']] + + class Header0(BasePart): macroName = 'header' @@ -313,6 +321,7 @@ class ConceptRelationView(BaseConceptRelationView, ConceptView): adImg = adapted(r) showInfo = adImg.showInfo and adImg.metaInfo return dict(src=src, fullImageUrl=fullSrc, title=r.title, + description=r.description, url=url, cssClass=self.parentView.imageCssClass, showInfo=showInfo) @@ -347,6 +356,7 @@ class ResourceView(BaseResourceView): adImg = adapted(self.context) showInfo = adImg.showInfo and adImg.metaInfo return dict(src=src, fullImageUrl=fullSrc, title=self.context.title, + description=self.context.description, url=url, cssClass=self.parentView.imageCssClass, showInfo=showInfo) diff --git a/browser/resource.py b/browser/resource.py index bb69813..720f243 100644 --- a/browser/resource.py +++ b/browser/resource.py @@ -146,9 +146,9 @@ class ResourceView(BaseView): subMacro=self.template.macros['related'], priority=20, info=self) versionable = IVersionable(self.context, None) - if versionable is not None and len(versionable.versions) > 1: + if (versionable is not None and + not versionable.notVersioned and len(versionable.versions) > 1): cont.macros.register('portlet_right', 'versions', - #title=' '. join((_('Version'), versionable.versionId)), title=_(u'Version ${versionId}', mapping=dict(versionId=versionable.versionId)), subMacro=version_macros.macros['portlet_versions'], diff --git a/browser/resource_macros.pt b/browser/resource_macros.pt index e30a3fb..2a8b9fb 100644 --- a/browser/resource_macros.pt +++ b/browser/resource_macros.pt @@ -66,17 +66,16 @@

Description 

- Download - + View @@ -84,7 +83,7 @@ - diff --git a/browser/skin/lobo/body.pt b/browser/skin/lobo/body.pt index e9c1a36..50577c5 100644 --- a/browser/skin/lobo/body.pt +++ b/browser/skin/lobo/body.pt @@ -16,7 +16,7 @@ tal:attributes="src string:${resourceBase}logo.png" />

-
diff --git a/browser/skin/lobo/lobo.css b/browser/skin/lobo/lobo.css index 317bf01..712e4ca 100644 --- a/browser/skin/lobo/lobo.css +++ b/browser/skin/lobo/lobo.css @@ -6,10 +6,26 @@ /* page sections */ +body { + background-color: #f8f8f8; +} + +.container { + padding: 15px 20px 20px 20px; + background-color: #ffffff; + margin-top: 20px; + margin-bottom: 20px; + border: 1px solid #d0d0d0; +} + #portlets { margin-top: 1em; } +.head-description, .legend { + font-style: italic; +} + ul.view-modes { padding: 0 0 0 2em; margin: 0.7em 0 0 0; @@ -244,12 +260,7 @@ fieldset.box td { .top-actions { position: absolute; - top: 1em; -} - -.quicksearch { - position: absolute; - top: 0.5em; + top: 30px; } .quicksearch input { @@ -258,13 +269,13 @@ fieldset.box td { .language-switch { position: absolute; - top: 2.5em; + top: 55px; } .page-actions { position: absolute; - top: 0.8em; - margin-left: 18.5em; + top: 55px; + margin-left: 210px; } .top image { diff --git a/browser/skin/lobo/print.css b/browser/skin/lobo/print.css index c8b0c74..19dd977 100644 --- a/browser/skin/lobo/print.css +++ b/browser/skin/lobo/print.css @@ -13,6 +13,6 @@ body { #content { /* width: 100%; */ - width: 70%; + width: 80%; color: Black; } diff --git a/expert/browser/search.pt b/expert/browser/search.pt index f4b1fe6..4bcfc4d 100644 --- a/expert/browser/search.pt +++ b/expert/browser/search.pt @@ -129,7 +129,7 @@ - \n" "Language-Team: loops developers \n" "MIME-Version: 1.0\n" @@ -437,6 +437,12 @@ msgstr "Suchbegriff" msgid "Select if you want to create a new version" msgstr "Bitte markieren, wenn Sie eine neue Version anlegen möchten" +msgid "Suppress Versioning" +msgstr "Keine Versionierung" + +msgid "Check this field if you want to suppress versioning for this resource." +msgstr "Bitte markieren, wenn diese Ressource nicht versioniert werden soll." + msgid "Search text" msgstr "Suchtext" diff --git a/versioning/interfaces.py b/versioning/interfaces.py index 1241dea..51e130c 100644 --- a/versioning/interfaces.py +++ b/versioning/interfaces.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2006 Helmut Merz helmutm@cy55.de +# Copyright (c) 2012 Helmut Merz helmutm@cy55.de # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,8 +18,6 @@ """ Versioning interfaces. - -$Id$ """ from zope.interface import Interface, Attribute @@ -30,31 +28,34 @@ class IVersionable(Interface): """ An object that may exist in different versions. """ - versionNumbers = Attribute(u'A tuple of version numbers for the context ' + versionNumbers = Attribute('A tuple of version numbers for the context ' 'object, with a number for each level') - variantIds = Attribute(u'A tuple of variant IDs (e.g. for language ' + variantIds = Attribute('A tuple of variant IDs (e.g. for language ' 'varuants) for the context object') - versionId = Attribute(u'A string identifying this version, e.g. 1.1_de, ' + versionId = Attribute('A string identifying this version, e.g. 1.1_de, ' 'derived from versionNumbers and variantIds') - master = Attribute(u'The object (master version) that should be used for access to ' + master = Attribute('The object (master version) that should be used for access to ' 'version-independent attributes and central ' 'versioning metadata') - parent = Attribute(u'The version this one was created from') + parent = Attribute('The version this one was created from') - comment = Attribute(u'Somme informative text provided when creating ' + comment = Attribute('Somme informative text provided when creating ' 'this version') # attributes taken from the master version: - versions = Attribute(u'A dictionary of all versions of this object') + versions = Attribute('A dictionary of all versions of this object') - currentVersion = Attribute(u'The default version to be used for editing') + currentVersion = Attribute('The default version to be used for editing') - releasedVersion = Attribute(u'The default version to be used for viewing') + releasedVersion = Attribute('The default version to be used for viewing') + + notVersioned = Attribute('A boolean that is True if this object should ' + 'not be versioned') def createVersion(level=1): """ Create a copy of the context object as a new version and return it. diff --git a/versioning/versionable.py b/versioning/versionable.py index 421bc4d..1e85db3 100644 --- a/versioning/versionable.py +++ b/versioning/versionable.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2007 Helmut Merz helmutm@cy55.de +# Copyright (c) 2012 Helmut Merz helmutm@cy55.de # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,8 +18,6 @@ """ Utilities for managing version informations. - -$Id$ """ from BTrees.OOBTree import OOBTree @@ -129,6 +127,13 @@ class VersionableResource(object): m = self.versionableMaster return self.versionableMaster.getVersioningAttribute('releasedVersion', None) + def getNotVersioned(self): + m = self.versionableMaster + return self.versionableMaster.getVersioningAttribute('notVersioned', False) + def setNotVersioned(self, value): + self.versionableMaster.setVersioningAttribute('notVersioned', bool(value)) + notVersioned = property(getNotVersioned, setNotVersioned) + def createVersionObject(self, versionNumbers, variantIds, comment=u''): versionableMaster = self.versionableMaster versionableMaster.initVersions()