Changeset 1304:7148358f6d8d

Timestamp:

01/11/10 23:41:00 (2 years ago)

Author:

mitsuhiko

Branch:

default

rebase_source:

eb8b8bc2f5191339c815cffe75463873380a1be8

Message:

Heavily improved new-style notifications.

Location:

zine

Files:

• shared/admin/style.css (modified) (2 diffs)
• shared/js/Admin.js (modified) (3 diffs)
• views/admin.py (modified) (15 diffs)

zine/shared/admin/style.css

@@ -829 +829 @@
 div.contents div.notification-messages {
     position: fixed;
-    top: 10px;
-    right: 20px;
+    top: 0;
+    right: 10px;
     width: 250px;
+    height: 0px;
     font-size: 13px;
 }
@@ -837 +838 @@
 div.contents div.message {
     border: 1px solid #B4D2E7;
-    margin: 0 -10px 10px -10px;
+    margin: 10px 0;
     padding: 8px 8px 8px 32px;
     -moz-border-radius: 3px;

zine/shared/js/Admin.js

@@ -14 +14 @@
   (function() {
     var shuttingDown = false;
-    var active = false;
-    var msg = null, left, top, right, bottom;
+    var hiddenMsg = null, left, top, right, bottom;
     var messages = $('div.message').hide().fadeIn('slow');
 
     function fadeInMsg() {
-      if (msg)
-        msg.css('visibility', 'visible').animate({'opacity': '1.0'}, 'fast');
-      msg = null;
+      hiddenMsg.css('visibility', 'visible').animate({opacity: '1.0'});
+      hiddenMsg = null;
     }
 
@@ -27 +25 @@
       if (shuttingDown && !$(this).is('.message-error'))
         return;
-      if (msg)
+      if (hiddenMsg)
         fadeInMsg();
-      msg = $(this);
+      var msg = $(this);
       var pos = msg.offset();
       left = pos.left - 2, top = pos.top - 2;
@@ -36 +34 @@
       bottom = top + msg.height() + parseInt(msg.css('padding-top')) +
                parseInt(msg.css('padding-bottom')) + 4;
-      msg.animate({
-        opacity:      '0.01'
-      }, 'fast', function() { msg.css('visibility', 'hidden'); });
+      msg.animate({opacity: '0.01'}, 'fast', function() {
+        hiddenMsg = msg;
+        hiddenMsg.css('visibility', 'hidden');
+      });
     });
 
     $(document).mousemove(function(evt) {
-      if (!msg)
+      if (!hiddenMsg)
         return;
       if (evt.clientX < left || evt.clientX > right ||

zine/views/admin.py

@@ -153 +153 @@
             ('import', url_for('admin/import'), _(u'Import')),
             ('export', url_for('admin/export'), _(u'Export')),
-            ('log', url_for('admin/log'), _('Log'))
+            ('log', url_for('admin/log'), _(u'Log'))
         ]
 
@@ -181 +181 @@
                                         request.user.has_privilege(BLOG_ADMIN):
         flash(_(u'Zine is in maintenance mode. Don\'t forget to '
-                u'<a href="%s">turn it off again</a> once you finish your '
+                u'turn it off again once you finish your '
                 u'changes.') % url_for('admin/maintenance'))
 
@@ -251 +251 @@
         for url in form.find_new_links():
             host = urlparse(url)[1].decode('utf-8', 'ignore')
-            html_url = '<a href="%s">%s</a>' % (
-                escape(url, True),
-                escape(host)
-            )
             try:
                 pingback(this_url, url)
@@ -260 +256 @@
                 if not e.ignore_silently:
                     flash(_(u'Could not ping %(url)s: %(error)s') % {
-                        'url': html_url,
+                        'url':   escape(host),
                         'error': e.message
                     }, 'error')
@@ -380 +376 @@
             if post is None:
                 post = form.make_post()
-                msg = _('The entry %s was created successfully.')
+                msg = _(u'The entry “%s” was created successfully.')
             else:
                 form.save_changes()
-                msg = _('The entry %s was updated successfully.')
-
-            flash(msg % u'<a href="%s">%s</a>' % (escape(url_for(post)),
-                                                  escape(post.title)))
+                msg = _(u'The entry “%s” was updated successfully.')
+
+            flash(msg % escape(post.title))
 
             db.commit()
@@ -416 +411 @@
             form.add_invalid_redirect_target('admin/edit_post', post_id=post.id)
             form.delete_post()
-            flash(_(u'The entry %s was deleted successfully.') %
+            flash(_(u'The entry “%s” was deleted successfully.') %
                   escape(post.title), 'remove')
             db.commit()
@@ -459 +454 @@
             if post is None:
                 post = form.make_post()
-                msg = _('The page %s was created successfully.')
+                msg = _(u'The page “%s” was created successfully.')
             else:
                 form.save_changes()
-                msg = _('The page %s was updated successfully.')
-
-            flash(msg % u'<a href="%s">%s</a>' % (escape(url_for(post)),
-                                                  escape(post.title)))
+                msg = _(u'The page “%s” was updated successfully.')
+
+            flash(msg % escape(post.title))
 
             db.commit()
@@ -495 +489 @@
             form.add_invalid_redirect_target('admin/edit_post', post_id=post.id)
             form.delete_post()
-            flash(_(u'The page %s was deleted successfully.') %
+            flash(_(u'The page “%s” was deleted successfully.') %
                   escape(post.title), 'remove')
             db.commit()
@@ -548 +542 @@
             elif 'delete_all' in request.form:
                 if identifier not in ('spam', 'blocked'):
-                    flash(_('“Delete All” can only be issued for “Spam” and '
-                            '“Blocked” comment types.'), 'error')
+                    flash(_(u'“Delete All” can only be issued for “Spam” and '
+                            u'“Blocked” comment types.'), 'error')
                 elif 'confirm' in request.form:
                     comments = query.all()
@@ -793 +787 @@
     return render_admin_response('admin/mark_comment.html',
                                  'comments.overview', form=form.as_widget(),
-                                 form_action=_('Spam'))
+                                 form_action=_(u'Spam'))
 
 @require_admin_privilege(MODERATE_COMMENTS | MODERATE_OWN_ENTRIES |
@@ -850 +844 @@
             if category is None:
                 category = form.make_category()
-                msg = _(u'Category %s created successfully.')
+                msg = _(u'Category “%s” created successfully.')
                 msg_type = 'add'
             else:
                 form.save_changes()
-                msg = _(u'Category %s updated successfully.')
+                msg = _(u'Category “%s” updated successfully.')
                 msg_type = 'info'
             db.commit()
-            html_category_detail = u'<a href="%s">%s</a>' % (
-                escape(url_for(category)),
-                escape(category.name)
-            )
-            flash(msg % html_category_detail, msg_type)
+            flash(msg % escape(category.name), msg_type)
             return redirect_to('admin/manage_categories')
 
@@ -923 +913 @@
             if user is None:
                 user = form.make_user()
-                msg = _(u'User %s created successfully.')
+                msg = _(u'User “%s” created successfully.')
                 icon = 'add'
             else:
                 form.save_changes()
-                msg = _(u'User %s edited successfully.')
+                msg = _(u'User “%s” edited successfully.')
                 icon = 'info'
             db.commit()
-            html_user_detail = u'<a href="%s">%s</a>' % (
-                escape(url_for(user)),
-                escape(user.username)
-            )
-            flash(msg % html_user_detail, icon)
+            flash(msg % escape(user.username), icon)
             if request.form.get('save'):
                 return form.redirect('admin/manage_users')
@@ -991 +977 @@
             if group is None:
                 group = form.make_group()
-                msg = _(u'Group %s created successfully.')
+                msg = _(u'Group “%s” created successfully.')
                 icon = 'add'
             else:
                 form.save_changes()
-                msg = _(u'Group %s edited successfully.')
+                msg = _(u'Group “%s” edited successfully.')
                 icon = 'info'
             db.commit()
-            html_group_detail = u'<a href="%s">%s</a>' % (
-                escape(url_for(group)),
-                escape(group.name))
-            flash(msg % html_group_detail, icon)
+            flash(msg % escape(group.name), icon)
 
             if request.form.get('save'):
@@ -1123 +1106 @@
     if request.method == 'POST' and form.validate(request.form):
         form.apply()
-        flash(_('Plugin configuration changed'), 'configure')
+        flash(_(u'Plugin configuration changed'), 'configure')
 
         new_plugin = request.files.get('new_plugin')
@@ -1416 +1399 @@
     if request.method == 'POST' and form.validate(request.form):
         form.apply()
-        flash(_('Log changes saved.'), 'configure')
+        flash(_(u'Log changes saved.'), 'configure')
         return redirect_to('admin/log', page=page.number)
     return render_admin_response('admin/log.html', 'system.log',