Changeset 2993

Timestamp:

01/07/08 08:58:56 (1 year ago)

Author:

athomas

Message:

Form validation and messages, hints.

Files:

• trachacksplugin/0.11/setup.py (modified) (1 diff)
• trachacksplugin/0.11/trachacks/htdocs/css/trachacks.css (modified) (2 diffs)
• trachacksplugin/0.11/trachacks/htdocs/js/trachacks.js (modified) (1 diff)
• trachacksplugin/0.11/trachacks/htdocs/pointer.gif (added)
• trachacksplugin/0.11/trachacks/__init__.py (modified) (1 diff)
• trachacksplugin/0.11/trachacks/templates/hacks_new.html (added)
• trachacksplugin/0.11/trachacks/validate.py (added)
• trachacksplugin/0.11/trachacks/web_ui.py (moved) (moved from trachacksplugin/0.11/trachacks/trachacks.py) (6 diffs)

trachacksplugin/0.11/setup.py

@@ -13 +13 @@
-        ],
-    entry_points={
-
+
+
+
-        },
-    install_requires=[

trachacksplugin/0.11/trachacks/htdocs/css/trachacks.css

@@ -3 +3 @@
-
-.newhack {
-85
+64
-}
-
-.newhack input[type="text"] {
-
+
+
+
+
+
+
+
+
+
-}
-
@@ -19 +27 @@
-}
-
-
-
-
-
-
-
+
+
-  font-size: xx-small;
-
-
+
+
+
-  background: #b0ffb0;
-2
+1
-  margin: 0em;
-  padding: 0.2em 1em;
-}
+
+.newhack div.error {
+  background: #ffb0b0;
+  border: 1px solid #e04040;
+  width: 90%;
+  text-align: center;
+  margin: 0.2em 0em;
+  padding: 2px;
+  font-weight: bold;
+}
+
+.newhack .hint .hint-pointer {
+    position: absolute;
+    left: -10px;
+    top: 5px;
+    width: 10px;
+    height: 19px;
+    background: url(../pointer.gif) left top no-repeat;
+}

trachacksplugin/0.11/trachacks/htdocs/js/trachacks.js

@@ -1 +1 @@
-$(document).ready(function() {
-info
-info
-info
-info
+hint
+hint
+hint
+hint
-
-    $('label[@for="' + fieldid + '"]').each(function() {
-    var title = $(this).text();
-
-      $(info).prepend('<strong>' + title + '</strong>');
-    });
-  });
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    $('#name').focus();
-
-
-
-
-
-
-
-
-
-
-
-
+
-});

trachacksplugin/0.11/trachacks/__init__.py

@@ -1 @@
-from trachacks import *

trachacksplugin/0.11/trachacks/web_ui.py

@@ -10 +10 @@
-from trac.core import *
-from trac.config import *
+from trac.perm import IPermissionRequestor
+from trac.web.chrome import Chrome
-from acct_mgr.htfile import HtPasswdStore
-from acct_mgr.api import IPasswordStore
-from trac.wiki.model import WikiPage
-from trac.util.compat import sorted
-
+, ITemplateStreamFilter
-from trac.web.chrome import ITemplateProvider, INavigationContributor, \
-                            add_stylesheet, add_script, add_ctxtnav
@@ -23 +25 @@
-from tracvote import VoteSystem
-from genshi.builder import tag as builder
+from genshi.filters.transform import Transformer
+from trachacks.validate import *
-
-
@@ -46 +50 @@
-class TracHacksHandler(Component):
-    """Trac-Hacks request handler."""
-
+
+
-
-    limit = IntOption('trachacks', 'limit', 25,
@@ -53 +58 @@
-    path_match = re.compile(r'/hacks/?(new|cloud|list)?')
-    title_extract = re.compile(r'=\s+([^=]*)=', re.MULTILINE | re.UNICODE)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    # IRequestHandler methods
+
-    def match_request(self, req):
-        return self.path_match.match(req.path_info)
@@ -101 +127 @@
-        return self.render_cloud(req, data, hacks)
-
+    # INavigationContributor methods
+    def get_active_navigation_item(self, req):
+        return 'hacks'
+
+    def get_navigation_items(self, req):
+        yield ('mainnav', 'hacks',
+                builder.a('Hacks', href=req.href.hacks(), accesskey='H'))
+
+    # ITemplateProvider methods
+    def get_templates_dirs(self):
+        """
+        Return the absolute path of the directory containing the provided
+        ClearSilver templates.
+        """
+        from pkg_resources import resource_filename
+        return [resource_filename(__name__, 'templates')]
+
+    def get_htdocs_dirs(self):
+        """Return the absolute path of a directory containing additional
+        static resources (such as images, style sheets, etc).
+        """
+        from pkg_resources import resource_filename
+        return [('hacks', resource_filename(__name__, 'htdocs'))]
+
+    # IPermissionRequestor methods
+    def get_permission_actions(self):
+        return ['HACK_CREATE']
+
+    # Internal methods
-    def render_new(self, req, data):
+        req.perm.require('HACK_CREATE')
+
-        add_script(req, 'common/js/wikitoolbar.js')
+
+        data['focus'] = 'name'
+
+        # Populate data with form submission
+        if req.method == 'POST' and 'create' in req.args or 'preview' in req.args:
+            data.update(req.args)
+
+            _, errors = self.form.validate(data)
+            data['errors'] = errors
+        else:
+            data['type'] = 'plugin'
+            data['release'] = ['0.11']
+
-        return 'hacks_new.html', data, None
-
@@ -202 +272 @@
-        return hacks
-
-    # INavigationContributor methods
-    def get_active_navigation_item(self, req):
-        return 'hacks'
-
-    def get_navigation_items(self, req):
-        yield ('mainnav', 'hacks',
-                builder.a('Hacks', href=req.href.hacks(), accesskey='H'))
-
-    # ITemplateProvider methods
-    def get_templates_dirs(self):
-        """
-        Return the absolute path of the directory containing the provided
-        ClearSilver templates.
-        """
-        from pkg_resources import resource_filename
-        return [resource_filename(__name__, 'templates')]
-
-    def get_htdocs_dirs(self):
-        """Return the absolute path of a directory containing additional
-        static resources (such as images, style sheets, etc).
-        """
-        from pkg_resources import resource_filename
-        return [('hacks', resource_filename(__name__, 'htdocs'))]
-
-
-