Commits

Roger Haase committed eade7d9 Merge

merge

Comments (0)

Files changed (7)

MoinMoin/templates/base.html

 
     {% block theme_stylesheets %}
     <link media="all" rel="stylesheet" href="{{ theme_static('css/common.css') }}" />
-    <link media="screen" rel="stylesheet" href="{{ theme_static('css/screen.css') }}" />
-    <link media="print" rel="stylesheet" href="{{ theme_static('css/print.css') }}" />
-    <link media="projection" rel="stylesheet" href="{{ theme_static('css/projection.css') }}" />
     {% endblock %}
     {{ stylesheets }}
     {% if user.valid and user.css_url -%}

MoinMoin/templates/diff.html

 {% extends theme("show.html") %}
 {% block content %}
 {% block headline %}
-<h1>{{ _("Item: %(item_name)s (Diff bettween revision %(oldrevno)s and %(newrevno)s)", item_name=newrev.item.name, oldrevno=oldrev.revno, newrevno=newrev.revno) }}</h1>
+<h1>{{ _("Item: %(item_name)s (Diff between revision %(oldrevno)s and %(newrevno)s)", item_name=newrev.item.name, oldrevno=oldrev.revno, newrevno=newrev.revno) }}</h1>
 {% endblock %}
 {{ item._render_data_diff(oldrev, newrev) }}
 {% endblock %}

MoinMoin/templates/layout.html

             {%- if wiki_name -%}
                 <a href="{{ item_href }}"{{ " " }}
                    title="{{ wiki_name }}"
-                   class="{% if err %}moin-badinterwiki{% else %}interwiki{% endif %}">
+                   class="{% if err %}moin-badinterwiki{% else %}moin-interwiki{% endif %}">
                    {{ item_name|shorten_item_name }}
                 </a>
             {%- else -%}

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

 strong.highlight { background-color: #CCE0FF; padding: 1px; }
 
 /* pre */
-pre { border: 1pt solid #AEBDCC; background-color: #F3F5F7; padding: 5pt;
+pre { border: 1pt solid #AEBDCC; background-color: #F3F5F7; padding: 5pt; clear: both;
             font-family: courier, monospace; margin: .33em 0; white-space: pre; }
 pre.comment { background-color: #CCC; color: red; padding: 0; margin: 0; border: 0; }
 pre.comment:before { content: url(../img/attention.png); }
 
 /* TableOfContents macro */
 div.moin-table-of-contents { border: 1px solid #BBB; color: black;
-    font-size: 80%; margin: 0.5em 0 0.5em 1em; padding: 0.5em 0.75em 0.5em 0.5em; text-indent: -1em;
-    max-width: 35%; text-align: left; float: right; clear: both;
-    box-shadow: 10px 10px 5px #679; border-radius: 15px;
-    -moz-box-shadow: 10px 10px 5px #679; -moz-border-radius: 15px;
-    -webkit-box-shadow: 10px 10px 5px #679; -webkit-border-radius: 15px; }
+            font-size: 80%; margin: 0.5em 0 0.5em 1em; padding: 0.5em 0.75em 0.5em 0.5em; text-indent: -1em;
+            max-width: 35%; text-align: left; float: right; clear: both;
+            box-shadow: 10px 10px 5px #679; border-radius: 15px;
+            -moz-box-shadow: 10px 10px 5px #679; -moz-border-radius: 15px;
+            -webkit-box-shadow: 10px 10px 5px #679; -webkit-border-radius: 15px; }
 .moin-table-of-contents ol { margin: 0; padding: 0 0 0 .92em; }
-.moin-table-of-contents li { margin: .12em 0 0 0; padding: 0; list-style:none;}
+.moin-table-of-contents li { margin: .12em 0 0 0; padding: 0; list-style:none; }
 .moin-table-of-contents-heading { font-weight: bold; padding: 0; margin: 0 0 0.5em 1em; letter-spacing: 0.075em; }
 .moin-showhide { margin-left: 10px; }
 
 .blue { background-color: #CCF; }
 .yellow { background-color: #FFF29F; }
 .orange { background-color: #FFD59B; }
-.solid { border: 2px solid #000; padding: 2px; }
-.dashed { border: 2px dashed #888; padding: 2px; }
-.dotted { border: 2px dotted #000; padding: 2px; }
+.solid { border: 2px solid #000; padding: 2px; clear: both; }
+.dashed { border: 2px dashed #888; padding: 2px; clear: both; }
+.dotted { border: 2px dotted #000; padding: 2px; clear: both; }
 .left { text-align: left; }
 .center { text-align: center; }
 .right { text-align: right; }
 #moin-content div.tip,
 #moin-content div.warning { border: 1px solid #E5E5E5; background-color: #F9F9FF;
             background-repeat: no-repeat; background-position: 8px 8px;  color: black;
-            margin: 10px 30px 10px 30px; min-height: 64px; padding-left: 64px; }
+            margin: 10px 30px 10px 30px; min-height: 64px; padding-left: 64px; clear: both; }
 #moin-content div.caution p,
 #moin-content div.important p,
 #moin-content div.note p,
 .highlight .vg { color: #19177C; } /* Name.Variable.Global */
 .highlight .vi { color: #19177C; } /* Name.Variable.Instance */
 .highlight .il { color: #666666; } /* Literal.Number.Integer.Long */
+
+/* end of CSS declarations common to all devices */
+
+
+@media screen, projection {
+
+/* general */
+body { background-color: #F3F7FD; }
+
+/* moin-content */
+#moin-page { margin: 0; padding: 2px 20px 20px; box-shadow: 1px 1px 33px -11px inset;
+/* support for firefox 3.5/3.6 and safari */
+-moz-box-shadow: 1px 1px 33px -11px inset; -webkit-box-shadow: inset 1px 1px 33px -11px black; }
+
+/* links */
+a:link { color: #47F; text-decoration: none; }
+a:visited { text-decoration: none; color: #04A; }
+a:visited:hover { text-decoration: none; color: red; }
+a:hover,
+a:active { text-decoration: underline; color: green; }
+a.moin-nonexistent:link { color: #666; }
+a.moin-nonexistent:hover { color: black; text-decoration: underline; }
+/* placeholder - not used yet
+a.download { font-size: 120%; letter-spacing: 0.05em; font-weight: bold; background: #E7E7E7;
+            border: 1px solid #9C9C9C; padding: 0.5em; text-align: center; }
+*/
+
+/* moin-header */
+#moin-header { margin: 0px; padding: 0px;
+            background: url(../img/white_clouds.png); /* background: #E6EAF0; */
+            line-height: 1.12em; }
+
+/* moin-header searchform */
+#moin-searchform { margin: 8px .5em; padding: 0; font-size: 0.82em; float: right;  text-align: right; }
+#moin-searchform input { font-size: 100%; vertical-align: middle;
+            background-color: #F3F7FD; /* same as body bg col */
+            border: 1px solid #A4B9DF; }
+#moin-searchform label { display:none; }
+#moin-searchform div { margin: 0; }
+
+/* moin-header moin-logo -- logos may be text only */
+#moin-logo { float: left; margin: 5px 10px; padding: 0; font-size: 1.4em; line-height: 1em; font-weight: bold; }
+#moin-logo img { vertical-align: middle; }
+#moin-logo a { color: black; text-decoration: none; }
+
+/* moin-header moin-username */
+#moin-username { display: block; margin: 0px 12px 4px 12px; padding: 0; font-size: 0.82em; }
+#moin-username form { display: inline; }
+#moin-username input { display: inline; padding: 0; margin: 0; border: none; background: transparent; color: blue; font-size: 0.82em; cursor: pointer; }
+#moin-username input:hover { color: red; }
+
+/* moin-header moin-locationline */
+#moin-locationline { padding: 0; font-size: 100%; font-weight: normal; margin: 0.25em 12px 5px 12px; }
+#moin-pagelocation { font-size: 1.5em; letter-spacing: 0.05em; }
+
+/* moin-header moin-pagetrail */
+#moin-pagetrail { margin: 0 0.88em 0.25em 12px; padding: 0; font-size: 0.88em; }
+
+/* moin-header moin-navibar */
+#moin-navibar { clear: both;  display: block; margin: 0; padding: 0 10px; font-size: 0.82em; }
+#moin-navibar li { float: left; display: inline; margin: 0 2px; padding: 2px 5px; border: 1px solid #A4B9DF;
+            border-bottom: none; white-space: nowrap; font-size: .88em; }
+#moin-navibar li.wikilink { background: #F3F7FD; } /* same as body background */
+#moin-navibar li.userlink { background: #C4D9FF; }
+#moin-navibar a,
+#moin-navibar a:visited { color: black; text-decoration: none; }
+#moin-navibar li:hover { background: #A4B9DF; }
+
+/* moin-header moin-pageline  */
+#moin-pageline { clear: both; margin: 0; padding: 0; width: 100%; height: 4px;
+            border-bottom: 1px solid #4D7DA9; border-top: 1px solid #4D7DA9; background: #81BBF2; }
+
+/* moin-header moin-editbar -- also applies to moin-footer */
+.moin-editbar { clear: both; display: block; margin: 0; padding: 2px 8px; background: #C4D9FF;
+            font-size: 0.8em; border-bottom: 1px solid #4D7DA9; border-top: 1px solid #4D7DA9; margin-top: -1px; }
+.moin-editbar li { display: inline; padding: 0; margin: 4px 6px; }
+.moin-editbar a,
+.moin-editbar a:visited { color: #0044B3; }
+.moin-editbar a:hover { text-decoration: underline; }
+.moin-editbar form,
+.moin-editbar form div { display: inline; margin: 0; }
+.moin-editbar select { font-size: 100%; vertical-align: middle; }
+
+/* moin-page moin-footer */
+#moin-footer { clear: both; margin: 0 0; }
+#moin-footer hr { margin: 0; background-color: #ccc; }
+#moin-pageinfo,
+#moin-wikilicense,
+#moin-credits,
+#moin-version,
+#moin-timings { margin: 10px 20px; text-align: left; font-size: 0.7em; color: #6C7680; }
+#moin-timings li { display: inline-block; margin: 0 20px 0 0; }
+#moin-credits span {display: inline-block; margin: 0 5px; }
+#moin-creditlogos { float: right; list-style: none; margin: 0 10px; }
+#moin-creditlogos li { display: inline-block; margin: 10px 0 10px 10px; }
+
+/* wikiconfig -- page_footer1/2 and page_header1/2 if defined */
+/* placeholder, not working yet */
+
+.page-object { margin: 0px; width: auto; height: auto; display: block; position: relative; }
+.object-overlay { background-color: black; position: absolute; padding: 5px; border-radius: 1em;
+            -moz-border-radius: 1em; -webkit-border-radius: 1em; text-align: center; white-space: nowrap; font-size: 120%;
+            font-weight: bold; 	display: none; margin: 0; opacity: .5; }
+.object-overlay-wrapper { width: 20px; height: 20px; position: absolute; z-index: 100; top: 0px; left: 0px; margin: 0; }
+.object-overlay-wrapper:hover  .object-overlay { display: block; top: -20px; left: 0px; }
+.page-object:hover .object-overlay:hover { opacity: .8; filter: alpha(opacity=90); }
+.object-overlay a:link,
+.object-overlay a:visited { color: white; }
+
+/* special style for heading with mouseover permalinks */
+.permalink { display: none; cursor: pointer; font-size: 80%; margin-left: 3px; }
+a.permalink { color: #95A09F; }
+a:hover.permalink { color: #C1CFCD; }
+h1:hover .permalink,
+h2:hover .permalink,
+h3:hover .permalink,
+h4:hover .permalink,
+h5:hover .permalink,
+h6:hover .permalink { display: inline; }
+
+} /* end of @media screen, projection */
+
+
+@media print {
+
+html { font-family: Times, serif; font-size: 12pt; width: 100%; }
+body, #moin-page, #moin-page, #moin-content-data { margin: 0; padding: 0; }
+
+a, a:visited, a.nonexistent,
+a.badinterwiki { color: black !important; text-decoration: none !important; }
+
+a.interwiki:before, a.badinterwiki:before { content: attr(title) ":"; }
+a.interwiki img, a.badinterwiki img { display: none; }
+
+pre { font-size: 10pt; }
+.footnotes div { width: 5em; border-top: 1pt solid gray; }
+div.moin-table-of-contents { box-shadow: none; -moz-box-shadow:  none; -webkit-box-shadow:  none;  }
+
+a.permalink, a.moin-showhide, a.showhide,
+#moin-header, #moin-sidebar, #moin-footer, #moin-timings, #moin-credits, #moin-interwiki,
+#moin-pagelocation { display: none; }
+
+#moin-pageinfo { color: gray; font-size: .67em; float: right; }
+#moin-pageinfo a { color: gray; }
+
+}   /* end of @media print */
+
+
+@media projection {
+
+html { line-height: 1.8em; }
+
+body, b, em, a, span, div, p, td { font-size: 18pt; }
+
+h1 { font-size: 26pt; }
+h2 { font-size: 22pt; }
+h3 { font-size: 20pt; }
+h4 { font-size: 18pt; }
+h5 { font-size: 16pt; }
+h6 { font-size: 14pt; }
+
+tt, pre { font-size: 16pt; }
+sup, sub { font-size: 12pt; }
+
+table.navigation { float: right; margin: 2px; }
+.navigation td, .navigation a {  font-size: 10pt; padding: 2px; }
+
+#moin-interwiki, #moin-pagelocation, #moin-pageinfo { display: none; }
+
+#moin-header, #moin-sidebar, #moin-footer, #moin-timings, #moin-credits, #moin-interwiki,
+#moin-pagelocation { display: none; }
+
+#moin-pageinfo { color: gray; font-size: .67em; float: right; }
+#moin-pageinfo a { color: gray; }
+
+}   /* end of @media projection */

MoinMoin/themes/modernized/static/css/print.css

-/*  print.css - MoinMoin Default Styles
-
-    Copyright: 2001, 2002, 2003 MoinMoin:JuergenHermann
-    Copyright: 2010 MoinMoin:RogerHaase
-    License: GNU GPL v2 or later, see COPYING for details.
-*/
-
-/* user is expected to use page setup to set margins and print background images (smileys) */
-
-/* content */
-html { font-family: Times, serif; font-size: 12pt; width: 100%;}
-body, #moin-page, #moin-page, #moin-content-data { margin: 0; padding: 0}
-
-a, a:visited, a.nonexistent, 
-a.badinterwiki { color: black; text-decoration: none; }
-
-a.interwiki:before, a.badinterwiki:before { content: attr(title) ":"; }
-a.interwiki img, a.badinterwiki img { display: none; }
-
-pre { font-size: 10pt; }
-.footnotes div { width: 5em; border-top: 1pt solid gray; }
-
-/* user interface - do not display */
-#moin-header, #moin-sidebar, #moin-footer, #moin-timings, #moin-credits, #moin-interwiki, 
-#moin-pagelocation { display: none; }
-
-/* page-bottom */
-#moin-pageinfo { color: gray; font-size: .67em; float: right; }
-#moin-pageinfo a { color: gray; }

MoinMoin/themes/modernized/static/css/projection.css

-/*  projection.css - MoinMoin Slide Styles
-
-    Copyright: 2003 MoinMoin:JuergenHermann
-    Copyright: 2010 MoinMoin:RogerHaase
-    License: GNU GPL v2 or later, see COPYING for details.
-*/
-
-@import url(screen.css);
-
-html { line-height: 1.8em; }
-
-body, b, em, a, span, div, p, td { font-size: 18pt; }
-
-h1 { font-size: 26pt; }
-h2 { font-size: 22pt; }
-h3 { font-size: 20pt; }
-h4 { font-size: 18pt; }
-h5 { font-size: 16pt; }
-h6 { font-size: 14pt; }
-
-tt, pre { font-size: 16pt; }
-sup, sub { font-size: 12pt; }
-
-table.navigation { float: right; margin: 2px; }
-
-.navigation td, .navigation a {  font-size: 10pt; padding: 2px; }
-
-#moin-interwiki, #moin-pagelocation, #moin-pageinfo { display: none; }
-
-
-/* user interface styles */
-#moin-header, #moin-sidebar, #moin-footer, #moin-timings, #moin-credits, #moin-interwiki, 
-#moin-pagelocation { display: none; }
-
-/* page-bottom */
-#moin-pageinfo { color: gray; font-size: .67em; float: right; }
-#moin-pageinfo a { color: gray; }

MoinMoin/themes/modernized/static/css/screen.css

-/* screen.css - MoinMoin Default Styles
-
-    Copyright: 2001, 2002, 2003 MoinMoin:JuergenHermann
-    Copyright: 2010 MoinMoin:RogerHaase
-    License: GNU GPL v2 or later, see COPYING for details.
-*/
-
-/* general */
-body { background-color: #F3F7FD; }
-
-/* moin-content */
-#moin-page {
-margin: 0;
-padding: 2px 20px 20px;
-box-shadow: 1px 1px 33px -11px inset;
-/* support for firefox 3.5/3.6 and safari */
--moz-box-shadow: 1px 1px 33px -11px inset;
--webkit-box-shadow: inset 1px 1px 33px -11px black;
-}
-
-/* links */
-a:link { color: #47F; text-decoration: none; }
-a:visited { text-decoration: none; color: #04A; }
-a:visited:hover { text-decoration: none; color: red; }
-a:hover,
-a:active { text-decoration: underline; color: green; }
-a.moin-nonexistent:link { color: #666; }
-a.moin-nonexistent:hover { color: black; text-decoration: underline; } 
-/* placeholder - not used yet
-a.download { font-size: 120%; letter-spacing: 0.05em; font-weight: bold; background: #E7E7E7; 
-            border: 1px solid #9C9C9C; padding: 0.5em; text-align: center; }
-*/
-
-/* moin-header */
-#moin-header { margin: 0px; padding: 0px;
-               background: url(../img/white_clouds.png); /* background: #E6EAF0; */
-               line-height: 1.12em; }
-
-/* moin-header searchform */
-#moin-searchform { margin: 8px .5em; padding: 0; font-size: 0.82em; float: right;  text-align: right; }
-#moin-searchform input { font-size: 100%; vertical-align: middle;
-                         background-color: #F3F7FD; /* same as body bg col */
-                         border: 1px solid #A4B9DF; }
-#moin-searchform label { display:none; }
-#moin-searchform div { margin: 0; }
-
-/* moin-header moin-logo -- logos may be text only */
-#moin-logo { float: left; margin: 5px 10px; padding: 0; font-size: 1.4em; line-height: 1em; font-weight: bold; }
-#moin-logo img { vertical-align: middle; }
-#moin-logo a { color: black; text-decoration: none; }
-
-/* moin-header moin-username */
-#moin-username { display: block; margin: 0px 12px 4px 12px; padding: 0; font-size: 0.82em; }
-#moin-username form { display: inline; }
-#moin-username input { display: inline; padding: 0; margin: 0; border: none; background: transparent; color: blue; font-size: 0.82em; cursor: pointer; }
-#moin-username input:hover { color: red; }
-
-/* moin-header moin-locationline */
-#moin-locationline { padding: 0; font-size: 100%; font-weight: normal; margin: 0.25em 12px 5px 12px; }
-#moin-pagelocation { font-size: 1.5em; letter-spacing: 0.05em; }
-
-/* moin-header moin-pagetrail */
-#moin-pagetrail { margin: 0 0.88em 0.25em 12px; padding: 0; font-size: 0.88em; }
-
-/* moin-header moin-navibar */
-#moin-navibar { clear: both;  display: block; margin: 0; padding: 0 10px; font-size: 0.82em; }
-#moin-navibar li { float: left; display: inline; margin: 0 2px; padding: 2px 5px; border: 1px solid #A4B9DF; 
-            border-bottom: none; white-space: nowrap; font-size: .88em; }
-#moin-navibar li.wikilink { background: #F3F7FD; } /* same as body background */
-#moin-navibar li.userlink { background: #C4D9FF; }
-#moin-navibar a,
-#moin-navibar a:visited { color: black; text-decoration: none; }
-#moin-navibar li:hover { background: #A4B9DF; }
-			
-/* moin-header moin-pageline  */
-#moin-pageline { clear: both; margin: 0; padding: 0; width: 100%; height: 4px; 
-            border-bottom: 1px solid #4D7DA9; border-top: 1px solid #4D7DA9; background: #81BBF2; }
-
-/* moin-header moin-editbar -- also applies to moin-footer */
-.moin-editbar { clear: both; display: block; margin: 0; padding: 2px 8px; background: #C4D9FF; 
-            font-size: 0.8em; border-bottom: 1px solid #4D7DA9; border-top: 1px solid #4D7DA9; margin-top: -1px; }
-.moin-editbar li { display: inline; padding: 0; margin: 4px 6px; }
-.moin-editbar a,
-.moin-editbar a:visited { color: #0044B3; }
-.moin-editbar a:hover { text-decoration: underline; }
-.moin-editbar form,
-.moin-editbar form div { display: inline; margin: 0; }
-.moin-editbar select { font-size: 100%; vertical-align: middle; }
-
-/* moin-page moin-footer */
-#moin-footer { clear: both; margin: 0 0; }
-#moin-footer hr { margin: 0; background-color: #ccc; }
-#moin-pageinfo,
-#moin-wikilicense,
-#moin-credits,
-#moin-version,
-#moin-timings{ margin: 10px 20px; text-align: left; font-size: 0.7em; color: #6C7680; }
-#moin-timings li { display: inline-block; margin: 0 20px 0 0; }
-#moin-credits span {display: inline-block; margin: 0 5px; }
-#moin-creditlogos { float: right; list-style: none; margin: 0 10px; }
-#moin-creditlogos li { display: inline-block; margin: 10px 0 10px 10px; }
-
-/* wikiconfig -- page_footer1/2 and page_header1/2 if defined */
-/* placeholder, not working yet */
-
-.page-object {
-    margin: 0px;
-    width: auto;
-    height: auto;
-    display:block;
-    position:relative;
-}
-
-.object-overlay {
-    background-color:black;
-    position:absolute;
-    padding: 5px;
-    border-radius: 1em;
-    -moz-border-radius:1em;
-    text-align: center;
-    white-space: nowrap;
-    font-size: 120%;
-    font-weight: bold;
-    display:none;
-    margin:0;
-    opacity: .5;
-}
-
-.object-overlay-wrapper {
-    width: 20px;
-    height: 20px;
-    position:absolute;
-    z-index:100;
-    top:0px;
-    left:0px;
-    margin:0;
-}
-
-.object-overlay-wrapper:hover  .object-overlay {
-    display:block;
-    top:-20px;
-    left:0px;
-}
-
-.page-object:hover .object-overlay:hover {
-    opacity: .8;
-    filter: alpha(opacity=90);
-}
-
-.object-overlay a:link,
-.object-overlay a:visited {
-    color:white;
-}
-
-/* special style for heading with mouseover permalinks */
-.permalink {
-    display:none;
-    cursor:pointer;
-    font-size: 80%;
-    margin-left: 3px;
-}
-
-a.permalink {
-    color:#95A09F
-}
-
-a:hover.permalink {
-    color:#C1CFCD
-}
-
-h1:hover .permalink, 
-h2:hover .permalink, 
-h3:hover .permalink,
-h4:hover .permalink,
-h5:hover .permalink,
-h6:hover .permalink {
-    display:inline;
-}
-