# HG changeset patch # User Nicolas Chauvat # Date 1257947098 -3600 # Node ID 9522e51d86449ddae7204383ab734c6ded384c8c # Parent 9fcf048e14b7564d40a48fe0108fe37037db3411 [web ui] move help from header to footer diff -r 9fcf048e14b7 -r 9522e51d8644 i18n/en.po --- a/i18n/en.po Tue Nov 10 18:13:07 2009 +0100 +++ b/i18n/en.po Wed Nov 11 14:44:58 2009 +0100 @@ -356,6 +356,9 @@ msgid "From:" msgstr "" +msgid "Help" +msgstr "" + msgid "Int" msgstr "Integer" @@ -787,6 +790,12 @@ msgid "actions_follow_description" msgstr "" +msgid "actions_help" +msgstr "" + +msgid "actions_help_description" +msgstr "" + msgid "actions_logout" msgstr "logout" diff -r 9fcf048e14b7 -r 9522e51d8644 i18n/es.po --- a/i18n/es.po Tue Nov 10 18:13:07 2009 +0100 +++ b/i18n/es.po Wed Nov 11 14:44:58 2009 +0100 @@ -364,6 +364,9 @@ msgid "From:" msgstr "De: " +msgid "Help" +msgstr "" + msgid "Int" msgstr "Número entero" @@ -810,6 +813,12 @@ msgid "actions_follow_description" msgstr "" +msgid "actions_help" +msgstr "" + +msgid "actions_help_description" +msgstr "" + msgid "actions_logout" msgstr "Desconectarse" diff -r 9fcf048e14b7 -r 9522e51d8644 i18n/fr.po --- a/i18n/fr.po Tue Nov 10 18:13:07 2009 +0100 +++ b/i18n/fr.po Wed Nov 11 14:44:58 2009 +0100 @@ -363,6 +363,9 @@ msgid "From:" msgstr "De :" +msgid "Help" +msgstr "Aide" + msgid "Int" msgstr "Nombre entier" @@ -815,6 +818,12 @@ msgid "actions_follow_description" msgstr "" +msgid "actions_help" +msgstr "" + +msgid "actions_help_description" +msgstr "" + msgid "actions_logout" msgstr "se déconnecter" @@ -3077,7 +3086,7 @@ msgstr "vues possibles" msgid "powered by CubicWeb" -msgstr "utilise la technologie CubicWeb" +msgstr "construit avec CubicWeb" msgid "prefered_form" msgstr "forme préférée" diff -r 9fcf048e14b7 -r 9522e51d8644 web/data/cubicweb.css --- a/web/data/cubicweb.css Tue Nov 10 18:13:07 2009 +0100 +++ b/web/data/cubicweb.css Wed Nov 11 14:44:58 2009 +0100 @@ -237,19 +237,6 @@ width: 100%; } -a.help{ - display: block; - margin: 0px 5px 0px 8px; - height: 17px; - width: 17px; - background: url('help.png') 0% 0% no-repeat; -} - -a.help:hover { - background-position: 0px -16px; - text-decoration: none; -} - /* FIXME appear with 4px width in IE6 */ div#stateheader{ min-width: 66%; @@ -508,6 +495,7 @@ div#userActionsBox a.popupMenu { color: black; text-decoration: underline; + padding-right: 2em; } /* download box XXX move to its own file? */ diff -r 9fcf048e14b7 -r 9522e51d8644 web/views/basecomponents.py --- a/web/views/basecomponents.py Tue Nov 10 18:13:07 2009 +0100 +++ b/web/views/basecomponents.py Wed Nov 11 14:44:58 2009 +0100 @@ -68,17 +68,6 @@ self.w(u'' % (self.req.base_url(), self.req.external_resource('LOGO'))) - -class ApplHelp(component.Component): - """build the help button, usually displayed in the header""" - id = 'help' - property_defs = VISIBLE_PROP_DEF - def call(self): - self.w(u' ' - % (self.build_url(_restpath='doc/main'), - self.req._(u'help'),)) - - class UserLink(component.Component): """if the user is the anonymous user, build a link to login else a link to the connected user object with a loggout link diff -r 9fcf048e14b7 -r 9522e51d8644 web/views/basetemplates.py --- a/web/views/basetemplates.py Tue Nov 10 18:13:07 2009 +0100 +++ b/web/views/basetemplates.py Wed Nov 11 14:44:58 2009 +0100 @@ -381,11 +381,6 @@ 'loggeduserlink', self.req, rset=self.rset) if comp: comp.render(w=self.w) - self.w(u'') - helpcomp = self.vreg['components'].select_vobject( - 'help', self.req, rset=self.rset) - if helpcomp: - helpcomp.render(w=self.w) self.w(u'') # lastcolumn self.w(u'') diff -r 9fcf048e14b7 -r 9522e51d8644 web/views/wdoc.py --- a/web/views/wdoc.py Tue Nov 10 18:13:07 2009 +0100 +++ b/web/views/wdoc.py Wed Nov 11 14:44:58 2009 +0100 @@ -236,6 +236,17 @@ self.w(rest_publish(self, '\n'.join(restdata))) +class HelpAction(action.Action): + id = 'help' + __select__ = yes() + + category = 'footer' + order = 0 + title = _('Help') + + def url(self): + return self.req.build_url('doc/main') + class ChangeLogAction(action.Action): id = 'changelog' __select__ = yes()