merge good/bad versions of imported patches...
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Wed, 05 May 2010 18:48:31 +0200
changeset 5483 1a30c5a56256
parent 5482 8c8c6d3f3b3a (current diff)
parent 5479 6ba3587c5cda (diff)
child 5486 5790462343cb
merge good/bad versions of imported patches...
web/data/cubicweb.css
web/data/cubicweb.manageview.css
web/data/uiprops.py
web/views/actions.py
--- a/web/data/cubicweb.css	Wed May 05 18:39:59 2010 +0200
+++ b/web/data/cubicweb.css	Wed May 05 18:48:31 2010 +0200
@@ -813,4 +813,4 @@
 ul .ui-tabs-panel {
   font-family: %(defaultFont)s;
   font-size: %(defaultSize)s;
-}
\ No newline at end of file
+}
--- a/web/data/cubicweb.manageview.css	Wed May 05 18:39:59 2010 +0200
+++ b/web/data/cubicweb.manageview.css	Wed May 05 18:48:31 2010 +0200
@@ -6,9 +6,9 @@
   width: 100%;
 }
 
-table.startup td {
-  padding: 0.1em 0.2em;
-}
+/* table.startup td { */
+/*   padding: 0.1em 0.2em; */
+/* } */
 
 table.startup td.addcol {
   text-align: right;
Binary file web/data/logo.png has changed
--- a/web/views/actions.py	Wed May 05 18:39:59 2010 +0200
+++ b/web/views/actions.py	Wed May 05 18:48:31 2010 +0200
@@ -15,14 +15,15 @@
 #
 # You should have received a copy of the GNU Lesser General Public License along
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
-"""Set of HTML base actions
+"""Set of HTML base actions"""
 
-"""
 __docformat__ = "restructuredtext en"
 _ = unicode
 
 from warnings import warn
 
+from logilab.mtconverter import xml_escape
+
 from cubicweb.schema import display_name
 from cubicweb.appobject import objectify_selector
 from cubicweb.selectors import (EntitySelector, yes,
@@ -421,7 +422,6 @@
     title = _('Got rhythm?')
 
     def url(self):
-        from logilab.mtconverter import xml_escape
         return xml_escape(self._cw.url()+'#')
 
     def html_class(self):