Commits

Thomas Waldmann  committed 1934add Merge

merged

  • Participants
  • Parent commits a43e5f3, 80a0eed

Comments (0)

Files changed (10)

File MoinMoin/static/css/stylus/ticket.styl

-#moin-ticket-form
-    dd
-        margin-top 0.1em
-    dt
-        margin-top 0.1em
-
-fields = (effort difficulty severity priority)
-remove_display_radio()
-    ids = ()
-    for level in 1..5
-        for field in fields
-            id = '#f_meta_%s_%s' % (field level)
-            push(ids, unquote(id))
-    ids = join(', ', ids)
-
-{unquote(remove_display_radio())}
-    display none
-
-css_for_label()
-    ids = ()
-    for level in 1..5
-        for field in fields
-            id = '#f_meta_%s_%s + label.moin-inline-label' % (field level)
-            push(ids, unquote(id))
-    ids = join(', ', ids)
-
-{unquote(css_for_label())}
-    padding-left 25px
-    padding-right 10px
-    height 20px
-    display inline-block
-    line-height 20px
-    background-repeat no-repeat
-    background-position 0 0
-    font-size 20px
-    vertical-align middle
-    cursor pointer
-
-css_for_checked_label()
-    ids = ()
-    for level in 1..5
-        for field in fields
-            id = '#f_meta_%s_%s:checked + label.moin-inline-label' % (field level)
-            push(ids, unquote(id))
-    ids = join(', ', ids)
-
-{unquote(css_for_checked_label())}
-    background-position 0 -20px
-
-label.moin-inline-label
-    background-image url('../img/radiobutton.png');
-
-#f_meta_tags, #f_meta_summary
-    -webkit-transition all 0.30s ease-in-out
-    -moz-transition all 0.30s ease-in-out
-    -ms-transition all 0.30s ease-in-out
-    -o-transition all 0.30s ease-in-out
-    outline none
-    width 200px
-    margin-top 20px
-    margin-bottom 20px
-    height 25px
-    padding 3px 0px 3px 3px
-    margin 5px 1px 3px 0px
-    border 1px solid #DDDDDD
-
-#f_meta_tags:focus, #f_meta_summary:focus
-    box-shadow 0 0 5px rgba(81, 203, 238, 1)
-    margin-top 20px
-    margin-bottom 20px
-    height 25px
-    padding 3px 0px 3px 3px
-    margin 5px 1px 3px 0px
-    border 1px solid rgba(81, 203, 238, 1)
-
-.moin-ticket-submit input[type=submit], #f_submit_update, #f_submit_update_negate_status
-    margin-top 10px
-    margin-bottom 20px
-    width auto
-    background-color #1b436d
-    height 40px
-    color #ffffff
-    border 2px solid
-
-select
-    display inline-block
-    margin-bottom 0
-    font-weight normal
-    text-align center
-    vertical-align middle
-    cursor pointer
-    border 1px solid
-    white-space nowrap
-    padding 6px 12px
-    font-size 14px
-    line-height 1.42857143
-    border-radius 4px
-    -webkit-user-select none
-
-.moin-ticket-submit, .moin-ticket-comments
-    float left
-    width 35em
-    clear both
-
-.moin-ticket-metadata
-    float right
-    width 30em
-
-#f_message
-    width 100%
-    height 150px
-
-h2
-    border-bottom none
-
-dt label
-    padding-top 10px
-
-dl dd
-    padding-bottom 10px
-
-.moin-ticket-link
-    padding-left 150px
-
-.moin-ticket-tags
-    padding-bottom 20px
-
-textarea
-    resize vertical
-
-.moin-form dt, .moin-form dd
-    text-align left
-    width 100%
-    padding-bottom 5px

File MoinMoin/static/css/ticket.css

-#moin-ticket-form dd{margin-top:.1em}
-#moin-ticket-form dt{margin-top:.1em}
-#f_meta_effort_1, #f_meta_difficulty_1, #f_meta_severity_1, #f_meta_priority_1, #f_meta_effort_2, #f_meta_difficulty_2, #f_meta_severity_2, #f_meta_priority_2, #f_meta_effort_3, #f_meta_difficulty_3, #f_meta_severity_3, #f_meta_priority_3, #f_meta_effort_4, #f_meta_difficulty_4, #f_meta_severity_4, #f_meta_priority_4, #f_meta_effort_5, #f_meta_difficulty_5, #f_meta_severity_5, #f_meta_priority_5{display:none}
-#f_meta_effort_1 + label.moin-inline-label, #f_meta_difficulty_1 + label.moin-inline-label, #f_meta_severity_1 + label.moin-inline-label, #f_meta_priority_1 + label.moin-inline-label, #f_meta_effort_2 + label.moin-inline-label, #f_meta_difficulty_2 + label.moin-inline-label, #f_meta_severity_2 + label.moin-inline-label, #f_meta_priority_2 + label.moin-inline-label, #f_meta_effort_3 + label.moin-inline-label, #f_meta_difficulty_3 + label.moin-inline-label, #f_meta_severity_3 + label.moin-inline-label, #f_meta_priority_3 + label.moin-inline-label, #f_meta_effort_4 + label.moin-inline-label, #f_meta_difficulty_4 + label.moin-inline-label, #f_meta_severity_4 + label.moin-inline-label, #f_meta_priority_4 + label.moin-inline-label, #f_meta_effort_5 + label.moin-inline-label, #f_meta_difficulty_5 + label.moin-inline-label, #f_meta_severity_5 + label.moin-inline-label, #f_meta_priority_5 + label.moin-inline-label{padding-left:25px;padding-right:10px;height:20px;display:inline-block;line-height:20px;background-repeat:no-repeat;background-position:0 0;font-size:20px;vertical-align:middle;cursor:pointer}
-#f_meta_effort_1:checked + label.moin-inline-label, #f_meta_difficulty_1:checked + label.moin-inline-label, #f_meta_severity_1:checked + label.moin-inline-label, #f_meta_priority_1:checked + label.moin-inline-label, #f_meta_effort_2:checked + label.moin-inline-label, #f_meta_difficulty_2:checked + label.moin-inline-label, #f_meta_severity_2:checked + label.moin-inline-label, #f_meta_priority_2:checked + label.moin-inline-label, #f_meta_effort_3:checked + label.moin-inline-label, #f_meta_difficulty_3:checked + label.moin-inline-label, #f_meta_severity_3:checked + label.moin-inline-label, #f_meta_priority_3:checked + label.moin-inline-label, #f_meta_effort_4:checked + label.moin-inline-label, #f_meta_difficulty_4:checked + label.moin-inline-label, #f_meta_severity_4:checked + label.moin-inline-label, #f_meta_priority_4:checked + label.moin-inline-label, #f_meta_effort_5:checked + label.moin-inline-label, #f_meta_difficulty_5:checked + label.moin-inline-label, #f_meta_severity_5:checked + label.moin-inline-label, #f_meta_priority_5:checked + label.moin-inline-label{background-position:0 -20px}
-label.moin-inline-label{background-image:url("../img/radiobutton.png")}
-#f_meta_tags,#f_meta_summary{-webkit-transition:all .3s ease-in-out;-moz-transition:all .3s ease-in-out;-ms-transition:all .3s ease-in-out;-o-transition:all .3s ease-in-out;outline:none;width:200px;margin-top:20px;margin-bottom:20px;height:25px;padding:3px 0 3px 3px;margin:5px 1px 3px 0;border:1px solid #ddd}
-#f_meta_tags:focus,#f_meta_summary:focus{box-shadow:0 0 5px #51cbee;margin-top:20px;margin-bottom:20px;height:25px;padding:3px 0 3px 3px;margin:5px 1px 3px 0;border:1px solid #51cbee}
-.moin-ticket-submit input[type=submit],#f_submit_update,#f_submit_update_negate_status{margin-top:10px;margin-bottom:20px;width:auto;background-color:#1b436d;height:40px;color:#fff;border:2px solid}
-select{display:inline-block;margin-bottom:0;font-weight:normal;text-align:center;vertical-align:middle;cursor:pointer;border:1px solid;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.42857143;border-radius:4px;-webkit-user-select:none}
-.moin-ticket-submit,.moin-ticket-comments{float:left;width:35em;clear:both}
-.moin-ticket-metadata{float:right;width:30em}
-#f_message{width:100%;height:150px}
-h2{border-bottom:none}
-dt label{padding-top:10px}
-dl dd{padding-bottom:10px}
-.moin-ticket-link{padding-left:150px}
-.moin-ticket-tags{padding-bottom:20px}
-.moin-form dt,.moin-form dd{text-align:left;width:100%;padding-bottom:5px}
+#moin-ticket-form dd {
+  margin-top: .1em;
+}
+#moin-ticket-form dt {
+  margin-top: .1em;
+}
+dd input[type="radio"] {
+  display: none;
+}
+label.moin-inline-label {
+  padding-left: 25px;
+  padding-right: 10px;
+  height: 20px;
+  display: inline-block;
+  line-height: 20px;
+  background-repeat: no-repeat;
+  background-position: 0 0;
+  font-size: 20px;
+  vertical-align: middle;
+  cursor: pointer;
+}
+dd input:checked + label {
+  background-position: 0 -20px;
+}
+label.moin-inline-label {
+  background-image: url("../img/radiobutton.png");
+}
+#f_meta_tags, #f_meta_summary {
+  transition: all .3s ease-in-out;
+  outline: none;
+  width: 200px;
+  margin-top: 20px;
+  margin-bottom: 20px;
+  height: 25px;
+  padding: 3px 0 3px 3px;
+  margin: 5px 1px 3px 0;
+  border: 1px solid #ddd;
+}
+#f_meta_tags:focus, #f_meta_summary:focus {
+  box-shadow: 0 0 5px #51cbee;
+  margin-top: 20px;
+  margin-bottom: 20px;
+  height: 25px;
+  padding: 3px 0 3px 3px;
+  margin: 5px 1px 3px 0;
+  border: 1px solid #51cbee;
+}
+.moin-ticket-submit input[type=submit], #f_submit_update, #f_submit_update_negate_status {
+  margin-top: 10px;
+  margin-bottom: 20px;
+  width: auto;
+  background-color: #1b436d;
+  height: 40px;
+  color: #ffffff;
+  border: 2px solid;
+}
+select {
+  display: inline-block;
+  margin-bottom: 0;
+  font-weight: normal;
+  text-align: center;
+  vertical-align: middle;
+  cursor: pointer;
+  border: 1px solid;
+  white-space: nowrap;
+  padding: 6px 12px;
+  font-size: 14px;
+  border-radius: 4px;
+  user-select: none;
+}
+.moin-ticket-submit, .moin-ticket-comments {
+  float: left;
+  width: 35em;
+  clear:both;
+}
+.moin-ticket-metadata {
+  float: right;
+  width: 30em;
+}
+#f_message {
+  width: 100%;
+  height: 150px;
+}
+h2 {
+  border-bottom: none;
+}
+dt label {
+  padding-top: 10px;
+}
+dl dd {
+  padding-bottom: 10px;
+}
+.moin-ticket-link {
+  padding-left: 150px;
+}
+.moin-ticket-tags {
+  padding-bottom: 20px;
+}

File MoinMoin/templates/blog/main.html

             {{ blog_utils.show_blog_entry(entry_item) }}
         {% endfor %}
     {% else %}
-        {{ no_entries_msg }}
+        <div class="moin-noblogentry-message">
+            {{ no_entries_msg }}
+        </div>
     {% endif %}
 {% endblock %}

File MoinMoin/templates/tickets.html

     </table>
 
     <p id="ticket-table-tip">
-        {{_("Tip: Sort multiple columns simultaneously by holding down the Shift key and clicking a second, third or even fourth column header!")}}
+        {{_("Tip: Sort multiple columns simultaneously by holding down the Shift key and clicking on additional column headers!")}}
     </p>
 {% else %}
     {{ _("No Ticket found.") }}

File MoinMoin/themes/basic/static/css/theme.css

   padding-left: 20px;
   cursor: pointer;
 }
+.sorter-false > .tablesorter-header-inner {
+  padding-left: 0px;
+}
 #ticket-summary {
   width: 50%;
 }

File MoinMoin/themes/basic/static/custom-less/theme.less

   padding-left: 20px;
   cursor: pointer;
 }
+.sorter-false > .tablesorter-header-inner {
+  padding-left:0px;
+}
 #ticket-summary {
   width: 50%;
 }

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

 #moin-blog-sidebar{display:table-cell;width:20%}
 .moin-blog-icon{font-size:1.6em}
 .moin-blog-entry-info{font-size:.8em;color:#737373}
-.moin-blog-entry-bottominfo{font-size:.8em;color:#737373;padding:0 1em;}
+.moin-blog-entry-bottominfo{font-size:.8em;color:#737373}
 .moin-blog-entry-modify{font-size:.8em;margin:0;float:right}
 ul.moin-blog-entry-tags{list-style:none;display:inline;margin:0;}
 ul.moin-blog-entry-tags li{display:inline;}
 ul.moin-blog-entry-tags li:after{content:","}
 ul.moin-blog-entry-tags li:last-child:after{content:""}
 .moin-blog-entry{border:2px solid #dfdfdf;padding-left:10px;padding-right:10px;padding-bottom:10px;border-radius:10px;background-color:#eef1f6}
-.moin-blog-entry h1{border-bottom:none;margin: 0.10em}
+.moin-blog-entry h1{border-bottom:none;margin-top: 0.10em}
 #moin-blog-header{margin:1em 0 -1em 0;font-size:20px;padding-bottom:10px}
 #moin-blog-content h1 a{text-decoration:none;font-size: 30px}
+.moin-noblogentry-message{padding-top:20px}

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

 .moin-blog-entry-bottominfo
     font-size 0.8em
     color footer_color
-    padding 0em 1em
 
 .moin-blog-entry-modify
     font-size 0.8em
 
 .moin-blog-entry h1
     border-bottom none
-    margin 0.10em
+    margin-top 0.10em
 
 #moin-blog-header
     margin 1em 0 -1em 0
 #moin-blog-content h1 a
     text-decoration none
     font-size 30px
+
+.moin-noblogentry-message
+    padding-top 20px

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

     right 40px
     position absolute
 
-#ticket-list thead th
+.tablesorter-header-inner
+    padding-left 20px
     cursor pointer
-    padding-left 20px
+
+.sorter-false > .tablesorter-header-inner
+    padding-left 0px
 
 .tablesorter-header
     background-image url('../../../../static/img/bg.png')

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

 #ticket-list{float:right;width:85%}
 .moin-ticketsearch-form{display:inline}
 #moin-ticketsearch-query{background-image:url("../../../../static/img/search.png");background-repeat:no-repeat;background-position:5px;padding-left:24px;width:150px;height:25px;right:40px;position:absolute}
-#ticket-list thead th{cursor:pointer;padding-left:20px}
+.tablesorter-header-inner{padding-left:20px;cursor:pointer}
+.sorter-false > .tablesorter-header-inner{padding-left:0}
 .tablesorter-header{background-image:url("../../../../static/img/bg.png");background-repeat:no-repeat;background-position:left center;background-color:#d8dfe9;color:#000}
 .tablesorter-headerAsc{background-image:url("../../../../static/img/asc.png")}
 .tablesorter-headerDesc{background-image:url("../../../../static/img/desc.png")}