Commits

Thomas Waldmann  committed 553bf17 Merge

merged

  • Participants
  • Parent commits 2af1b7d, e1bf58e

Comments (0)

Files changed (7)

File MoinMoin/apps/frontend/views.py

 
 
 class UserSettingsOptionsForm(Form):
-    # TODO: if the checkbox in the form is checked, we get key: u'1' in the
-    # form data and all is fine. if it is not checked, the key is not present
-    # in the form data and flatland assigns None to the attribute (not False).
-    # If moin detects the None, it thinks this has not been set and uses its
-    # builtin defaults (for some True, for some others False). Makes
-    # edit_on_doubleclick malfunctioning (because its default is True).
     name = 'usersettings_options'
     mailto_author = Checkbox.using(label=L_('Publish my email (not my wiki homepage) in author info'))
     edit_on_doubleclick = Checkbox.using(label=L_('Open editor on double click'))

File MoinMoin/constants/keys.py

 USEROBJ_ATTRS = [
     # User objects proxy these attributes of the UserProfile objects:
     NAME, DISABLED, ITEMID, ALIASNAME, ENC_PASSWORD, EMAIL, OPENID,
-    MAILTO_AUTHOR, SHOW_COMMENTS, RESULTS_PER_PAGE, EDIT_ON_DOUBLECLICK,
+    MAILTO_AUTHOR, SHOW_COMMENTS, RESULTS_PER_PAGE, EDIT_ON_DOUBLECLICK, SCROLL_PAGE_AFTER_EDIT,
     EDIT_ROWS, THEME_NAME, LOCALE, TIMEZONE, SUBSCRIBED_ITEMS, QUICKLINKS,
     CSS_URL,
 ]

File MoinMoin/templates/modify.html

 {% endblock %}
 
 {% block options_for_javascript %}
-{%- if user.edit_on_doubleclick -%}
+{%- if user.scroll_page_after_edit -%}
     <br id="moin-scroll-page-after-edit" />
 {%- endif %}
 {% endblock %}

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

 h4{font-size:1em;margin:1em 0;border-bottom:2px solid #ccc;padding-bottom:2px}
 h5{font-size:.8333333333333334em;margin:1.2em 0;border-bottom:1px solid #ccc;padding-bottom:1px}
 h6{font-size:.6944444444444444em;margin:1.44em 0;border-bottom:1px solid #ccc;padding-bottom:1px}
-a.permalink{display:none;cursor:pointer;margin-left:.1em;color:#616161;}
-a.permalink:hover{color:#000}
-h1:hover .permalink,h2:hover .permalink,h3:hover .permalink,h4:hover .permalink,h5:hover .permalink,h6:hover .permalink{display:inline;text-decoration:none}
+a.moin-permalink{display:none;cursor:pointer;margin-left:.1em;color:#808080;}
+a.moin-permalink:hover.moin-permalink{color:#ff2727}
+h1:hover .moin-permalink,h2:hover .moin-permalink,h3:hover .moin-permalink,h4:hover .moin-permalink,h5:hover .moin-permalink,h6:hover .moin-permalink{display:inline;text-decoration:none}
 hr{background-color:#000;border:0;margin:.9em 0;height:1px;}
 hr.moin-hr1{height:2px}
 hr.moin-hr2{height:3px}

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

         border-bottom heading_underline_thickness solid border_color
         padding-bottom heading_underline_thickness
 
-// special style for heading with mouseover permalinks
-a.permalink
+// headings with mouseover permalinks
+a.moin-permalink
     display none
     cursor pointer
     margin-left 0.1em
-    color footer_color
-    &:hover
-        color font_color
+    color nonexistent_link_color
+    &:hover.moin-permalink
+        color nonexistent_hover_color
 
-h1:hover .permalink,
-h2:hover .permalink,
-h3:hover .permalink,
-h4:hover .permalink,
-h5:hover .permalink,
-h6:hover .permalink
+h1:hover .moin-permalink,
+h2:hover .moin-permalink,
+h3:hover .moin-permalink,
+h4:hover .moin-permalink,
+h5:hover .moin-permalink,
+h6:hover .moin-permalink
     display inline
     text-decoration none
 

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

 .moin-item-overlay-ul:hover,.moin-item-overlay-lr:hover{opacity:.8;filter:alpha;background-color:#eef1f6;color:#1f9ae0}
 div.moin-item-wrapper,div.moin-item-wrapper > div,div.moin-item-wrapper > div > p:first-child,div.moin-item-wrapper > div > p:last-child{margin:0}
 div.moin-item-wrapper > div >  p:first-child ~ p:last-child{margin-top:1em}
-.moin-permalink{display:none;cursor:pointer;font-size:80%;margin-left:3px}
-a.moin-permalink{color:#939393}
-a:hover.moin-permalink{color:#1f62ad}
+a.moin-permalink{display:none;cursor:pointer;margin-left:.1em;color:#939393;}
+a.moin-permalink:hover.moin-permalink{color:#1f62ad}
 h1:hover .moin-permalink,h2:hover .moin-permalink,h3:hover .moin-permalink,h4:hover .moin-permalink,h5:hover .moin-permalink,h6:hover .moin-permalink{display:inline;text-decoration:none}
 @media print{html{font-family:serif;font-size:12pt;width:100%}
 body,#moin-page,#moin-page,#moin-content-data{margin:0;padding:0}

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

 div.moin-item-wrapper > div >  p:first-child ~ p:last-child
     margin-top 1em
 
-.moin-permalink
+// headings with mouseover permalinks
+a.moin-permalink
     display none
     cursor pointer
-    font-size 80%
-    margin-left 3px
-
-a.moin-permalink
+    margin-left .1em
     color nonexistent_link_color
-
-a:hover.moin-permalink
-    color nonexistent_hover_color
+    &:hover.moin-permalink
+        color nonexistent_hover_color
 
 h1:hover .moin-permalink,
 h2:hover .moin-permalink,