Commits

Thomas Waldmann  committed 9b93324 Merge

merged

  • Participants
  • Parent commits f83b666, 1e84ca1

Comments (0)

Files changed (14)

File MoinMoin/apps/admin/templates/admin/index.html

 {% block content %}
 <h1>{{ _("Admin Menu") }}</h1>
 <ul>
-    <li><a href="{{ url_for('admin.userbrowser') }}">{{ _("User Browser") }}</a></li>
-    <li><a href="{{ url_for('admin.sysitems_upgrade') }}">{{ _("Upgrade system items") }}</a></li>
+    <li><a href="{{ url_for('admin.userbrowser') }}">{{ _("Users") }}</a></li>
+    <li><a href="{{ url_for('admin.sysitems_upgrade') }}">{{ _("Upgrade System Items") }}</a></li>
     <li><a href="{{ url_for('admin.wikiconfig') }}">{{ _("Show Wiki Configuration") }}</a></li>
-    <li><a href="{{ url_for('admin.wikiconfighelp') }}">{{ _("Show Wiki Configuration Help") }}</a></li>
+    <li><a href="{{ url_for('admin.wikiconfighelp') }}">{{ _("Wiki Configuration Help") }}</a></li>
 </ul>
 {% endblock %}

File MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html

 {% extends theme("layout.html") %}
 {% block content %}
-<h1>{{ _("System items upgrade") }}</h1>
+<h1>{{ _("Upgrade System Items") }}</h1>
 <p>
 {{ _("You can upgrade your system items by uploading an xml file with new items below.") }}
 </p>

File MoinMoin/apps/admin/templates/admin/userbrowser.html

 {% extends theme("layout.html") %}
 {% block content %}
+    <h1>{{ _("Users") }}</h1>
     <table class="zebra">
     <tr>
         <th>{{ _("User name") }}</th>

File MoinMoin/apps/admin/templates/admin/wikiconfig.html

 {% extends theme("layout.html") %}
 {% block content %}
-<h1>{{ _("Wiki configuration") }}</h1>
+<h1>{{ _("Show Wiki Configuration") }}</h1>
 <p>
 {{ _("This table shows all settings in this wiki that do not have default values. "
      "Settings that the configuration system doesn't know about are shown in italic, "
 <table class="zebra">
 <thead>
 <tr>
-<th>{{ _('Variable name') }}</th>
+<th>{{ _('Variable Name') }}</th>
 <th>{{ _('Setting') }}</th>
 </tr>
 </thead>

File MoinMoin/apps/admin/templates/admin/wikiconfighelp.html

 {% extends theme("layout.html") %}
 {% block content %}
-<h1>{{ _("WikiConfig Help") }}</h1>
+<h1>{{ _("Wiki Configuration Help") }}</h1>
 {% for heading, desc, opts in groups %}
     <h2>{{ heading }}</h2>
     {% if desc %}
     <table class="zebra">
     <thead>
     <tr>
-        <th>{{ _('Variable name') }}</th>
+        <th>{{ _('Variable Name') }}</th>
         <th>{{ _('Default') }}</th>
         <th>{{ _('Description') }}</th>
     </tr>

File MoinMoin/apps/admin/templates/user/highlighterhelp.html

 {% import "utils.html" as utils %}
 {% extends theme("layout.html") %}
 {% block content %}
-<h1>{{ _("Available Highlighters") }}</h1>
+<h1>{{ _("Highlighters") }}</h1>
 {{ utils.table(headings, rows) }}
 {% endblock %}

File MoinMoin/apps/admin/templates/user/index_user.html

     <li><a href="{{ url_for('frontend.mychanges') }}">{{ _("My Changes") }}</a></li>
     <li><a href="{{ url_for('frontend.wanted_items') }}">{{ _("Wanted Items") }}</a></li>
     <li><a href="{{ url_for('frontend.orphaned_items') }}">{{ _("Orphaned Items") }}</a></li>
-    <li><a href="{{ url_for('admin.itemsize') }}">{{ _("Item sizes (latest revision)") }}</a></li>
-    <li><a href="{{ url_for('admin.interwikihelp') }}">{{ _("Known InterWiki names") }}</a></li>
-    <li><a href="{{ url_for('admin.highlighterhelp') }}">{{ _("Available Highlighters") }}</a></li>
+    <li><a href="{{ url_for('admin.itemsize') }}">{{ _("Item Sizes (last revision)") }}</a></li>
+    <li><a href="{{ url_for('admin.interwikihelp') }}">{{ _("InterWiki Names") }}</a></li>
+    <li><a href="{{ url_for('admin.highlighterhelp') }}">{{ _("Highlighters") }}</a></li>
 </ul>
 {% endblock %}

File MoinMoin/apps/admin/templates/user/interwikihelp.html

 {% import "utils.html" as utils %}
 {% extends theme("layout.html") %}
 {% block content %}
-<h1>{{ _("Known InterWiki names") }}</h1>
+<h1>{{ _("InterWiki Names") }}</h1>
 {{ utils.table(headings, rows, url_cols=[2]) }}
 {% endblock %}

File MoinMoin/apps/admin/templates/user/itemsize.html

 {% import "utils.html" as utils %}
 {% extends theme("layout.html") %}
 {% block content %}
-<h1>{{ _("Item sizes (latest revision)") }}</h1>
+<h1>{{ _("Item Sizes (last revision)") }}</h1>
 {{ utils.table(headings, rows, itemname_cols=[2]) }}
 {% endblock %}

File MoinMoin/apps/admin/views.py

                           groups=[groupname for groupname in groups if rev.meta[NAME] in groups[groupname]],
                      )
                      for rev in revs]
-    return render_template('admin/userbrowser.html', user_accounts=user_accounts, title_name=_(u"User Browser"))
+    return render_template('admin/userbrowser.html', user_accounts=user_accounts, title_name=_(u"Users"))
 
 
 @admin.route('/userprofile/<user_name>', methods=['GET', 'POST', ])
 
     found.sort()
     return render_template('admin/wikiconfig.html',
-                           title_name=_(u"Wiki Configuration"),
+                           title_name=_(u"Show Wiki Configuration"),
                            found=found, settings=settings)
 
 
     rows = sorted([[desc, ' '.join(names), ' '.join(patterns), ' '.join(mimetypes), ]
                    for desc, names, patterns, mimetypes in lexers])
     return render_template('user/highlighterhelp.html',
-                           title_name=_(u"Highlighter Help"),
+                           title_name=_(u"Highlighters"),
                            headings=headings,
                            rows=rows)
 
                ]
     rows = sorted(app.cfg.interwiki_map.items())
     return render_template('user/interwikihelp.html',
-                           title_name=_(u"Interwiki Help"),
+                           title_name=_(u"Interwiki Names"),
                            headings=headings,
                            rows=rows)
 
             for rev in flaskg.storage.documents(wikiname=app.cfg.interwikiname)]
     rows = sorted(rows, reverse=True)
     return render_template('user/itemsize.html',
-                           title_name=_(u"Item Size"),
+                           title_name=_(u"Item Sizes"),
                            headings=headings,
                            rows=rows)

File MoinMoin/config/default.py

 #
 options_no_group_name = {
   # ==========================================================================
-  'datastruct': ('Datastruct settings', None, (
+  'datastruct': ('Datastruct', None, (
     #('dicts', lambda cfg: datastruct.ConfigDicts({}),
     ('dicts', lambda cfg: datastruct.WikiDicts(),
      "function f(cfg) that returns a backend which is used to access dicts definitions."),
      "function f(cfg) that returns a backend which is used to access groups definitions."),
   )),
   # ==========================================================================
-  'auth': ('Authentication / Authorization / Security settings', None, (
+  'auth': ('Authentication / Authorization / Security', None, (
     ('auth', DefaultExpression('[MoinAuth()]'),
      "list of auth objects, to be called in this order (see HelpOnAuthentication)"),
     ('secrets', None, """Either a long shared secret string used for multiple purposes or a dict {"purpose": "longsecretstring", ...} for setting up different shared secrets for different purposes."""),
      'checks whether a password is acceptable (default check is length >= 6, at least 4 different chars, no keyboard sequence, not username used somehow (you can switch this off by using `None`)'),
   )),
   # ==========================================================================
-  'spam_leech_dos': ('Anti-Spam/Leech/DOS',
+  'spam_leech_dos': ('Anti-Spam / Leech / DOS',
   'These settings help limiting ressource usage and avoiding abuse.',
   (
     ('textchas', None,
      "Time [s] for a !TextCha to expire."),
   )),
   # ==========================================================================
-  'style': ('Style / Theme / UI related',
+  'style': ('Style / Theme / UI',
   'These settings control how the wiki user interface will look like.',
   (
     ('sitename', u'Untitled Wiki',
     ('template_dirs', [], "list of directories with templates that will override theme and base templates."),
   )),
   # ==========================================================================
-  'editor': ('Editor related', None, (
+  'editor': ('Editor', None, (
     ('item_license', u'', 'if set, show the license item within the editor. [Unicode]'),
     #('edit_locking', 'warn 10', "Editor locking policy: `None`, `'warn <timeout in minutes>'`, or `'lock <timeout in minutes>'`"),
     ('edit_ticketing', True, None),
   )),
   # ==========================================================================
-  'paging': ('Paging related', None, (
+  'paging': ('Paging', None, (
     ('results_per_page', 50, "Number of results to be shown on a single page in pagination"),
   )),
   # ==========================================================================
-  'data': ('Data storage', None, (
+  'data': ('Data Storage', None, (
     ('data_dir', './data/', "Path to the data directory."),
     ('plugin_dirs', [], "Plugin directories."),
 
     ('destroy_index', False, "Destroy (empty) the index after using it."),
   )),
   # ==========================================================================
-  'items': ('Special item names', None, (
+  'items': ('Special Item Names', None, (
     ('item_root', u'Home', "Name of the root item (aka 'front page'). [Unicode]"),
 
     # the following regexes should match the complete name when used in free text
      'Item names exactly matching this regex are regarded as items containing group definitions [Unicode]'),
   )),
   # ==========================================================================
-  'user': ('User Preferences related', None, (
+  'user': ('User Preferences', None, (
     ('user_defaults',
       dict(
         name=u'anonymous',
 #
 #
 options = {
-    'acl': ('Access control lists',
+    'acl': ('Access Control Lists',
     'ACLs control who may do what.',
     (
       ('functions', u'',
       ('user_homepage', 'User/', 'All user homepages are stored below this namespace.'),
     )),
 
-    'user': ('Users / User settings', None, (
+    'user': ('User', None, (
       ('email_unique', True,
        "if True, check email addresses for uniqueness and don't accept duplicates."),
       ('email_verification', False,
       ('use_gravatar', False, "if True, gravatar.com will be used to find User's avatar")
     )),
 
-    'mail': ('Mail settings',
+    'mail': ('Mail',
         'These settings control outgoing and incoming email from and to the wiki.',
     (
       ('from', None, "Used as From: address for generated mail. [Unicode]"),

File MoinMoin/themes/__init__.py

 def themed_error(e):
     item_name = request.view_args.get('item_name', u'')
     if e.code == 403:
-        title = L_('Access denied')
+        title = L_('Access Denied')
         description = L_('You are not allowed to access this resource.')
     else:
         # if we have no special code, we just return the HTTPException instance

File MoinMoin/themes/foobar/static/css/common.css

 .moin-subitem-navigation{overflow:hidden;word-wrap:break-word;}
 .moin-subitem-navigation ul{display:block;}
 .moin-subitem-navigation ul li{padding:.4em !important}
-.moin-subitem-navigation ul a{display:initial !important;color:#1e90ff;}
+.moin-subitem-navigation ul a{display:inline !important;color:#1e90ff;}
 .moin-subitem-navigation ul a:hover{text-decoration:underline}
 .moin-subitem-navigation .sep{font-size:1.2em;margin-left:0}
 .moin-subitem-navigation li ul{display:none;border-left:1px dotted #ccc;padding-left:5% !important}

File MoinMoin/themes/foobar/static/css/stylus/main.styl

         li
             padding .4em !important
         a
-            display initial !important
+            display inline !important
             color link_color
             &:hover
                 text-decoration underline