From: <var...@us...> - 2017-10-12 11:04:56
|
Revision: 10055 http://sourceforge.net/p/phpwiki/code/10055 Author: vargenau Date: 2017-10-12 11:04:53 +0000 (Thu, 12 Oct 2017) Log Message: ----------- Factor CSS in themes/default/phpwiki-common.css Modified Paths: -------------- trunk/themes/Crao/crao.css trunk/themes/Hawaiian/Hawaiian.css trunk/themes/MacOSX/MacOSX.css trunk/themes/MonoBook/monobook.css trunk/themes/MonoBook/templates/body.tmpl trunk/themes/MonoBook/templates/browse-footer.tmpl trunk/themes/Portland/portland.css trunk/themes/Sidebar/sidebar.css trunk/themes/Sidebar/templates/body.tmpl trunk/themes/Sidebar/templates/dump-footer.tmpl trunk/themes/SpaceWiki/SpaceWiki.css trunk/themes/Wordpress/Wordpress.css trunk/themes/blog/Kubrick.css trunk/themes/default/phpwiki.css trunk/themes/fusionforge/fusionforge.css trunk/themes/shamino_com/shamino_com.css trunk/themes/wikilens/wikilens.css Added Paths: ----------- trunk/themes/default/phpwiki-common.css Modified: trunk/themes/Crao/crao.css =================================================================== --- trunk/themes/Crao/crao.css 2017-10-11 16:21:26 UTC (rev 10054) +++ trunk/themes/Crao/crao.css 2017-10-12 11:04:53 UTC (rev 10055) @@ -5,6 +5,8 @@ * */ +@import url(../default/phpwiki-common.css); + /* ****************************** *****GENERIC @@ -62,56 +64,6 @@ margin-bottom: 1em; } -/* generic classes ----------------------------------------------- */ - -.tt { - font-family: monospace; -} - -.strike { - text-decoration: line-through; -} - -.big { - font-size: larger; -} - -.align-left { - text-align: left; -} - -.align-right { - text-align: right; -} - -.align-center { - text-align: center; -} - -.top { - vertical-align: top; -} - -.bottom { - vertical-align: bottom; -} - -.middle { - vertical-align: middle; -} - -.baseline { - vertical-align: baseline; -} - -.nowrap { - white-space: nowrap; -} - -.fullwidth { - width: 100%; -} - /* --------------------------------------------------------------- */ /* @@ -1167,75 +1119,3 @@ margin: 1ex 0; padding: 0.5ex 0.5em; } - -/* Transclude plugin ================================================== */ - -.transclude { - margin: 0; - width: 100%; -} - -/* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ - -/* - * table class="boxed" - * will put a border around the table (but not around the cells) - * - * table class="bordered" - * will put a border around the table and the cells - * - * In both cases, the caption will be bold and centered under the table - * - * In both cases, the headers (th) will have a "#d8d8d8" background - */ - -table.boxed, table.bordered, table.bordered th, table.bordered td { - border-width: 1px; - border-style: solid; - border-collapse: collapse; - vertical-align: top; -} - -table.boxed td, table.bordered td, -table.boxed th, table.bordered th { - padding-left: 5px; - padding-right: 5px; - padding-top: 0; - padding-bottom: 0; -} - -table.boxed caption, table.bordered caption { - text-align: center; - font-weight: bold; - caption-side: bottom; - padding-top: 0.8em; -} - -table.boxed th, table.bordered th { - font-weight: bold; - background-color: #d8d8d8; -} - -table.sortable th.header { - background-image: url(../default/buttons/sort_none.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortUp { - background-image: url(../default/buttons/sort_up.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortDown { - background-image: url(../default/buttons/sort_down.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} Modified: trunk/themes/Hawaiian/Hawaiian.css =================================================================== --- trunk/themes/Hawaiian/Hawaiian.css 2017-10-11 16:21:26 UTC (rev 10054) +++ trunk/themes/Hawaiian/Hawaiian.css 2017-10-12 11:04:53 UTC (rev 10055) @@ -7,6 +7,8 @@ * used to reference the various CalendarPlugin elements. */ +@import url(../default/phpwiki-common.css); + /** * General */ @@ -39,56 +41,6 @@ margin-bottom: .5ex; } -/* generic classes ----------------------------------------------- */ - -.tt { - font-family: monospace; -} - -.strike { - text-decoration: line-through; -} - -.big { - font-size: larger; -} - -.align-left { - text-align: left; -} - -.align-right { - text-align: right; -} - -.align-center { - text-align: center; -} - -.top { - vertical-align: top; -} - -.bottom { - vertical-align: bottom; -} - -.middle { - vertical-align: middle; -} - -.baseline { - vertical-align: baseline; -} - -.nowrap { - white-space: nowrap; -} - -.fullwidth { - width: 100%; -} - /* --------------------------------------------------------------- */ /** @@ -384,10 +336,6 @@ empty-cells: hide; } -/* Month-name & arrows area */ -table.cal thead { -} - table.cal table.cal-header td { padding-top: 110px; } @@ -541,12 +489,10 @@ margin: 1ex 0; padding: 0.5ex 0.5em; border: medium solid #d8caae; + background-image: url("images/tchecker-sand.png"); + background-repeat: repeat; } -.clear-floats { - clear: both; -} - /** * Search Results */ @@ -594,83 +540,3 @@ left: 0.5em; top: 0; } - -/** - * Other - */ -.debug { - background-image: url("images/tchecker-sand.png"); - background-repeat: repeat; -} - -/* Transclude plugin ================================================== */ - -.transclude { - margin: 0; - width: 100%; -} - -/* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ - -/* - * table class="boxed" - * will put a border around the table (but not around the cells) - * - * table class="bordered" - * will put a border around the table and the cells - * - * In both cases, the caption will be bold and centered under the table - * - * In both cases, the headers (th) will have a "#d8d8d8" background - */ - -table.boxed, table.bordered, table.bordered th, table.bordered td { - border-width: 1px; - border-style: solid; - border-collapse: collapse; - vertical-align: top; -} - -table.boxed td, table.bordered td, -table.boxed th, table.bordered th { - padding-left: 5px; - padding-right: 5px; - padding-top: 0; - padding-bottom: 0; -} - -table.boxed caption, table.bordered caption { - text-align: center; - font-weight: bold; - caption-side: bottom; - padding-top: 0.8em; -} - -table.boxed th, table.bordered th { - font-weight: bold; - background-color: #d8d8d8; -} - -table.sortable th.header { - background-image: url(../default/buttons/sort_none.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortUp { - background-image: url(../default/buttons/sort_up.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortDown { - background-image: url(../default/buttons/sort_down.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} Modified: trunk/themes/MacOSX/MacOSX.css =================================================================== --- trunk/themes/MacOSX/MacOSX.css 2017-10-11 16:21:26 UTC (rev 10054) +++ trunk/themes/MacOSX/MacOSX.css 2017-10-12 11:04:53 UTC (rev 10055) @@ -1,3 +1,5 @@ +@import url(../default/phpwiki-common.css); + /* Classes: @@ -72,56 +74,6 @@ margin-right: 0.5em; } -/* generic classes ----------------------------------------------- */ - -.tt { - font-family: monospace; -} - -.strike { - text-decoration: line-through; -} - -.big { - font-size: larger; -} - -.align-left { - text-align: left; -} - -.align-right { - text-align: right; -} - -.align-center { - text-align: center; -} - -.top { - vertical-align: top; -} - -.bottom { - vertical-align: bottom; -} - -.middle { - vertical-align: middle; -} - -.baseline { - vertical-align: baseline; -} - -.nowrap { - white-space: nowrap; -} - -.fullwidth { - width: 100%; -} - /* --------------------------------------------------------------- */ /** @@ -598,10 +550,6 @@ font-weight: normal; } -.clear-floats { - clear: both; -} - dl { display: table; } @@ -746,14 +694,6 @@ /* * wikiblog */ -.floatleft { - float: left; -} - -.floatright { - float: right; -} - div.wikiblog { margin: 1ex 2em; padding: 0 0; @@ -1133,75 +1073,3 @@ padding-left: 0.5ex; padding-right: 0.5ex; } - -/* Transclude plugin ================================================== */ - -.transclude { - margin: 0; - width: 100%; -} - -/* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ - -/* - * table class="boxed" - * will put a border around the table (but not around the cells) - * - * table class="bordered" - * will put a border around the table and the cells - * - * In both cases, the caption will be bold and centered under the table - * - * In both cases, the headers (th) will have a "#d8d8d8" background - */ - -table.boxed, table.bordered, table.bordered th, table.bordered td { - border-width: 1px; - border-style: solid; - border-collapse: collapse; - vertical-align: top; -} - -table.boxed td, table.bordered td, -table.boxed th, table.bordered th { - padding-left: 5px; - padding-right: 5px; - padding-top: 0; - padding-bottom: 0; -} - -table.boxed caption, table.bordered caption { - text-align: center; - font-weight: bold; - caption-side: bottom; - padding-top: 0.8em; -} - -table.boxed th, table.bordered th { - font-weight: bold; - background-color: #d8d8d8; -} - -table.sortable th.header { - background-image: url(../default/buttons/sort_none.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortUp { - background-image: url(../default/buttons/sort_up.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortDown { - background-image: url(../default/buttons/sort_down.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} Modified: trunk/themes/MonoBook/monobook.css =================================================================== --- trunk/themes/MonoBook/monobook.css 2017-10-11 16:21:26 UTC (rev 10054) +++ trunk/themes/MonoBook/monobook.css 2017-10-12 11:04:53 UTC (rev 10055) @@ -11,6 +11,8 @@ ** by Jeff Dairiki */ +@import url(../default/phpwiki-common.css); + #column-content { width: 100%; float: right; @@ -54,10 +56,6 @@ padding: 0; } -.visualClear { - clear: both; -} - /* general styles */ table { @@ -247,56 +245,6 @@ line-height: 1.1em; } -/* generic classes ----------------------------------------------- */ - -.tt { - font-family: monospace; -} - -.strike { - text-decoration: line-through; -} - -.big { - font-size: larger; -} - -.align-left { - text-align: left; -} - -.align-right { - text-align: right; -} - -.align-center { - text-align: center; -} - -.top { - vertical-align: top; -} - -.bottom { - vertical-align: bottom; -} - -.middle { - vertical-align: middle; -} - -.baseline { - vertical-align: baseline; -} - -.nowrap { - white-space: nowrap; -} - -.fullwidth { - width: 100%; -} - /* --------------------------------------------------------------- */ /* @@ -1849,47 +1797,6 @@ margin-left: -0.6em; } -/* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ - -/* - * table class="boxed" - * will put a border around the table (but not around the cells) - * - * table class="bordered" - * will put a border around the table and the cells - * - * In both cases, the caption will be bold and centered under the table - * - * In both cases, the headers (th) will have a "#d8d8d8" background - */ - -table.boxed, table.bordered, table.bordered th, table.bordered td { - border-width: 1px; - border-style: solid; - border-collapse: collapse; - vertical-align: top; -} - -table.boxed td, table.bordered td, -table.boxed th, table.bordered th { - padding-left: 5px; - padding-right: 5px; - padding-top: 0; - padding-bottom: 0; -} - -table.boxed caption, table.bordered caption { - text-align: center; - font-weight: bold; - caption-side: bottom; - padding-top: 0.8em; -} - -table.boxed th, table.bordered th { - font-weight: bold; - background-color: #d8d8d8; -} - /* RecentChanges plugin =============================================== */ td.tdselected, td.tdunselected { @@ -1935,13 +1842,6 @@ padding: 0.2em; } -/* Transclude plugin ================================================== */ - -.transclude { - margin: 0; - width: 100%; -} - /* IncludePage plugin ================================================= */ .transclusion-title { @@ -1980,27 +1880,3 @@ margin-top: 1ex; margin-bottom: 1ex; } - -table.sortable th.header { - background-image: url(../default/buttons/sort_none.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortUp { - background-image: url(../default/buttons/sort_up.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortDown { - background-image: url(../default/buttons/sort_down.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} Modified: trunk/themes/MonoBook/templates/body.tmpl =================================================================== --- trunk/themes/MonoBook/templates/body.tmpl 2017-10-11 16:21:26 UTC (rev 10054) +++ trunk/themes/MonoBook/templates/body.tmpl 2017-10-12 11:04:53 UTC (rev 10055) @@ -10,7 +10,7 @@ <?php echo $CONTENT ?> <?php // end content ?> - <div class="visualClear"></div> + <div class="clear-floats"></div> </div> </main> </div> Modified: trunk/themes/MonoBook/templates/browse-footer.tmpl =================================================================== --- trunk/themes/MonoBook/templates/browse-footer.tmpl 2017-10-11 16:21:26 UTC (rev 10054) +++ trunk/themes/MonoBook/templates/browse-footer.tmpl 2017-10-12 11:04:53 UTC (rev 10055) @@ -1,6 +1,6 @@ <footer role="contentinfo"> <?php // <hr class="printer" /> ?> - <div class="visualClear"></div> + <div class="clear-floats"></div> <div id="f-poweredbyico"><a href="http://www.phpwiki.fr/"><img src="<?php echo $WikiTheme->getImageURL("poweredby_phpwiki_51x31.png") ?>" alt="Powered by PhpWiki" /></a></div> <ul id="f-list"> <li id="f-lastmod"> <?php echo $WikiTheme->getOwnerMessage($page) ?> <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?> </li> Modified: trunk/themes/Portland/portland.css =================================================================== --- trunk/themes/Portland/portland.css 2017-10-11 16:21:26 UTC (rev 10054) +++ trunk/themes/Portland/portland.css 2017-10-12 11:04:53 UTC (rev 10055) @@ -4,6 +4,9 @@ * Styles are kept to a minimum, so the page will mostly appear * according to the browser's default font settings. */ + +@import url(../default/phpwiki-common.css); + body { color: black; background: white; @@ -21,60 +24,6 @@ text-align: right; } -.clear-floats { - clear: both; -} - -/* generic classes ----------------------------------------------- */ - -.tt { - font-family: monospace; -} - -.strike { - text-decoration: line-through; -} - -.big { - font-size: larger; -} - -.align-left { - text-align: left; -} - -.align-right { - text-align: right; -} - -.align-center { - text-align: center; -} - -.top { - vertical-align: top; -} - -.bottom { - vertical-align: bottom; -} - -.middle { - vertical-align: middle; -} - -.baseline { - vertical-align: baseline; -} - -.nowrap { - white-space: nowrap; -} - -.fullwidth { - width: 100%; -} - /* --------------------------------------------------------------- */ img.toolbar:hover { @@ -147,75 +96,3 @@ padding-bottom: 0; margin: 0.5ex 0; } - -/* Transclude plugin ================================================== */ - -.transclude { - margin: 0; - width: 100%; -} - -/* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ - -/* - * table class="boxed" - * will put a border around the table (but not around the cells) - * - * table class="bordered" - * will put a border around the table and the cells - * - * In both cases, the caption will be bold and centered under the table - * - * In both cases, the headers (th) will have a "#d8d8d8" background - */ - -table.boxed, table.bordered, table.bordered th, table.bordered td { - border-width: 1px; - border-style: solid; - border-collapse: collapse; - vertical-align: top; -} - -table.boxed td, table.bordered td, -table.boxed th, table.bordered th { - padding-left: 5px; - padding-right: 5px; - padding-top: 0; - padding-bottom: 0; -} - -table.boxed caption, table.bordered caption { - text-align: center; - font-weight: bold; - caption-side: bottom; - padding-top: 0.8em; -} - -table.boxed th, table.bordered th { - font-weight: bold; - background-color: #d8d8d8; -} - -table.sortable th.header { - background-image: url(../default/buttons/sort_none.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortUp { - background-image: url(../default/buttons/sort_up.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortDown { - background-image: url(../default/buttons/sort_down.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} Modified: trunk/themes/Sidebar/sidebar.css =================================================================== --- trunk/themes/Sidebar/sidebar.css 2017-10-11 16:21:26 UTC (rev 10054) +++ trunk/themes/Sidebar/sidebar.css 2017-10-12 11:04:53 UTC (rev 10055) @@ -12,6 +12,8 @@ ** "Edit this page" icon by Helge Fahrnberger */ +@import url(../default/phpwiki-common.css); + #column-content { width: 100%; float: right; @@ -50,10 +52,6 @@ padding: 0; } -.visualClear { - clear: both; -} - /* general styles */ table { @@ -248,56 +246,6 @@ line-height: 1.1em; } -/* generic classes ----------------------------------------------- */ - -.tt { - font-family: monospace; -} - -.strike { - text-decoration: line-through; -} - -.big { - font-size: larger; -} - -.align-left { - text-align: left; -} - -.align-right { - text-align: right; -} - -.align-center { - text-align: center; -} - -.top { - vertical-align: top; -} - -.bottom { - vertical-align: bottom; -} - -.middle { - vertical-align: middle; -} - -.baseline { - vertical-align: baseline; -} - -.nowrap { - white-space: nowrap; -} - -.fullwidth { - width: 100%; -} - /* --------------------------------------------------------------- */ /* @@ -1941,54 +1889,6 @@ margin: 0; } -/* Transclude plugin ================================================== */ - -.transclude { - margin: 0; - width: 100%; -} - -/* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ - -/* - * table class="boxed" - * will put a border around the table (but not around the cells) - * - * table class="bordered" - * will put a border around the table and the cells - * - * In both cases, the caption will be bold and centered under the table - * - * In both cases, the headers (th) will have a "#d8d8d8" background - */ - -table.boxed, table.bordered, table.bordered th, table.bordered td { - border-width: 1px; - border-style: solid; - border-collapse: collapse; - vertical-align: top; -} - -table.boxed td, table.bordered td, -table.boxed th, table.bordered th { - padding-left: 5px; - padding-right: 5px; - padding-top: 0; - padding-bottom: 0; -} - -table.boxed caption, table.bordered caption { - text-align: center; - font-weight: bold; - caption-side: bottom; - padding-top: 0.8em; -} - -table.boxed th, table.bordered th { - font-weight: bold; - background-color: #d8d8d8; -} - /* RecentChanges plugin =============================================== */ td.tdselected, td.tdunselected { @@ -2021,27 +1921,3 @@ border-color: green; padding: 0.5em; } - -table.sortable th.header { - background-image: url(../default/buttons/sort_none.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortUp { - background-image: url(../default/buttons/sort_up.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortDown { - background-image: url(../default/buttons/sort_down.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} Modified: trunk/themes/Sidebar/templates/body.tmpl =================================================================== --- trunk/themes/Sidebar/templates/body.tmpl 2017-10-11 16:21:26 UTC (rev 10054) +++ trunk/themes/Sidebar/templates/body.tmpl 2017-10-12 11:04:53 UTC (rev 10055) @@ -6,7 +6,7 @@ <?php echo Template('top') ?> <div id="bodyContent"> <?php echo $CONTENT ?> - <div class="visualClear"></div> + <div class="clear-floats"></div> </div> </main> </div> Modified: trunk/themes/Sidebar/templates/dump-footer.tmpl =================================================================== --- trunk/themes/Sidebar/templates/dump-footer.tmpl 2017-10-11 16:21:26 UTC (rev 10054) +++ trunk/themes/Sidebar/templates/dump-footer.tmpl 2017-10-12 11:04:53 UTC (rev 10055) @@ -2,7 +2,7 @@ if (empty($revision)) $revision = $page->getCurrentRevision(); ?> <hr class="printer" /> -<div class="visualClear"></div> +<div class="clear-floats"></div> <div><?php echo $WikiTheme->getOwnerMessage($page) ?> <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?><br /> This page was accessed <?php echo $page->get('hits') ?> times, and edited <?php echo $revision->getVersion() ?> times.</div> Modified: trunk/themes/SpaceWiki/SpaceWiki.css =================================================================== --- trunk/themes/SpaceWiki/SpaceWiki.css 2017-10-11 16:21:26 UTC (rev 10054) +++ trunk/themes/SpaceWiki/SpaceWiki.css 2017-10-12 11:04:53 UTC (rev 10055) @@ -18,6 +18,8 @@ * #ff7e00; orange */ +@import url(../default/phpwiki-common.css); + /** * General */ @@ -70,56 +72,6 @@ color: #5791ff; } -/* generic classes ----------------------------------------------- */ - -.tt { - font-family: monospace; -} - -.strike { - text-decoration: line-through; -} - -.big { - font-size: larger; -} - -.align-left { - text-align: left; -} - -.align-right { - text-align: right; -} - -.align-center { - text-align: center; -} - -.top { - vertical-align: top; -} - -.bottom { - vertical-align: bottom; -} - -.middle { - vertical-align: middle; -} - -.baseline { - vertical-align: baseline; -} - -.nowrap { - white-space: nowrap; -} - -.fullwidth { - width: 100%; -} - /* --------------------------------------------------------------- */ /** @@ -723,10 +675,6 @@ display: table; } -.clear-floats { - clear: both; -} - /** * Search Results */ @@ -974,75 +922,3 @@ padding: 2px; margin: 1px; } - -/* Transclude plugin ================================================== */ - -.transclude { - margin: 0; - width: 100%; -} - -/* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ - -/* - * table class="boxed" - * will put a border around the table (but not around the cells) - * - * table class="bordered" - * will put a border around the table and the cells - * - * In both cases, the caption will be bold and centered under the table - * - * In both cases, the headers (th) will have a "#d8d8d8" background - */ - -table.boxed, table.bordered, table.bordered th, table.bordered td { - border-width: 1px; - border-style: solid; - border-collapse: collapse; - vertical-align: top; -} - -table.boxed td, table.bordered td, -table.boxed th, table.bordered th { - padding-left: 5px; - padding-right: 5px; - padding-top: 0; - padding-bottom: 0; -} - -table.boxed caption, table.bordered caption { - text-align: center; - font-weight: bold; - caption-side: bottom; - padding-top: 0.8em; -} - -table.boxed th, table.bordered th { - font-weight: bold; - background-color: #d8d8d8; -} - -table.sortable th.header { - background-image: url(../default/buttons/sort_none.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortUp { - background-image: url(../default/buttons/sort_up.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortDown { - background-image: url(../default/buttons/sort_down.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} Modified: trunk/themes/Wordpress/Wordpress.css =================================================================== --- trunk/themes/Wordpress/Wordpress.css 2017-10-11 16:21:26 UTC (rev 10054) +++ trunk/themes/Wordpress/Wordpress.css 2017-10-12 11:04:53 UTC (rev 10055) @@ -13,56 +13,8 @@ Please tweak this and make it your own. :) */ -/* generic classes ----------------------------------------------- */ +@import url(../default/phpwiki-common.css); -.tt { - font-family: monospace; -} - -.strike { - text-decoration: line-through; -} - -.big { - font-size: larger; -} - -.align-left { - text-align: left; -} - -.align-right { - text-align: right; -} - -.align-center { - text-align: center; -} - -.top { - vertical-align: top; -} - -.bottom { - vertical-align: bottom; -} - -.middle { - vertical-align: middle; -} - -.baseline { - vertical-align: baseline; -} - -.nowrap { - white-space: nowrap; -} - -.fullwidth { - width: 100%; -} - /* --------------------------------------------------------------- */ /* This stuff was copied straight out of portland.css */ @@ -695,14 +647,6 @@ /* * wikiblog */ -.floatleft { - float: left; -} - -.floatright { - float: right; -} - div.wikiblog { margin: 1ex 2em; padding: 0 0; @@ -810,10 +754,6 @@ margin: 1em 0 0.5em 0; } -.clear-floats { - clear: both; -} - /* postnuke css:*/ .gensmall { font-size: 10px @@ -1010,75 +950,3 @@ padding: .2em; vertical-align: top; } - -/* Transclude plugin ================================================== */ - -.transclude { - margin: 0; - width: 100%; -} - -/* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ - -/* - * table class="boxed" - * will put a border around the table (but not around the cells) - * - * table class="bordered" - * will put a border around the table and the cells - * - * In both cases, the caption will be bold and centered under the table - * - * In both cases, the headers (th) will have a "#d8d8d8" background - */ - -table.boxed, table.bordered, table.bordered th, table.bordered td { - border-width: 1px; - border-style: solid; - border-collapse: collapse; - vertical-align: top; -} - -table.boxed td, table.bordered td, -table.boxed th, table.bordered th { - padding-left: 5px; - padding-right: 5px; - padding-top: 0; - padding-bottom: 0; -} - -table.boxed caption, table.bordered caption { - text-align: center; - font-weight: bold; - caption-side: bottom; - padding-top: 0.8em; -} - -table.boxed th, table.bordered th { - font-weight: bold; - background-color: #d8d8d8; -} - -table.sortable th.header { - background-image: url(../default/buttons/sort_none.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortUp { - background-image: url(../default/buttons/sort_up.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortDown { - background-image: url(../default/buttons/sort_down.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} Modified: trunk/themes/blog/Kubrick.css =================================================================== --- trunk/themes/blog/Kubrick.css 2017-10-11 16:21:26 UTC (rev 10054) +++ trunk/themes/blog/Kubrick.css 2017-10-12 11:04:53 UTC (rev 10055) @@ -6,6 +6,8 @@ This is a work in progress - some of the original CSS may need collapsing */ +@import url(../default/phpwiki-common.css); + body { margin: 20px auto; padding: 0; @@ -188,56 +190,7 @@ border-bottom: 1px solid #ddd; } -/* generic classes ----------------------------------------------- */ -.tt { - font-family: monospace; -} - -.strike { - text-decoration: line-through; -} - -.big { - font-size: larger; -} - -.align-left { - text-align: left; -} - -.align-right { - text-align: right; -} - -.align-center { - text-align: center; -} - -.top { - vertical-align: top; -} - -.bottom { - vertical-align: bottom; -} - -.middle { - vertical-align: middle; -} - -.baseline { - vertical-align: baseline; -} - -.nowrap { - white-space: nowrap; -} - -.fullwidth { - width: 100%; -} - /* --------------------------------------------------------------- */ small { @@ -935,75 +888,3 @@ padding: .2em; vertical-align: top; } - -/* Transclude plugin ================================================== */ - -.transclude { - margin: 0; - width: 100%; -} - -/* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ - -/* - * table class="boxed" - * will put a border around the table (but not around the cells) - * - * table class="bordered" - * will put a border around the table and the cells - * - * In both cases, the caption will be bold and centered under the table - * - * In both cases, the headers (th) will have a "#d8d8d8" background - */ - -table.boxed, table.bordered, table.bordered th, table.bordered td { - border-width: 1px; - border-style: solid; - border-collapse: collapse; - vertical-align: top; -} - -table.boxed td, table.bordered td, -table.boxed th, table.bordered th { - padding-left: 5px; - padding-right: 5px; - padding-top: 0; - padding-bottom: 0; -} - -table.boxed caption, table.bordered caption { - text-align: center; - font-weight: bold; - caption-side: bottom; - padding-top: 0.8em; -} - -table.boxed th, table.bordered th { - font-weight: bold; - background-color: #d8d8d8; -} - -table.sortable th.header { - background-image: url(../default/buttons/sort_none.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortUp { - background-image: url(../default/buttons/sort_up.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortDown { - background-image: url(../default/buttons/sort_down.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} Added: trunk/themes/default/phpwiki-common.css =================================================================== --- trunk/themes/default/phpwiki-common.css (rev 0) +++ trunk/themes/default/phpwiki-common.css 2017-10-12 11:04:53 UTC (rev 10055) @@ -0,0 +1,133 @@ +/* generic classes ----------------------------------------------- */ + +.tt { + font-family: monospace; +} + +.strike { + text-decoration: line-through; +} + +.big { + font-size: larger; +} + +.align-left { + text-align: left; +} + +.align-right { + text-align: right; +} + +.align-center { + text-align: center; +} + +.top { + vertical-align: top; +} + +.bottom { + vertical-align: bottom; +} + +.middle { + vertical-align: middle; +} + +.baseline { + vertical-align: baseline; +} + +.nowrap { + white-space: nowrap; +} + +.fullwidth { + width: 100%; +} + +.floatleft { + float: left; +} + +.floatright { + float: right; +} + +.clear-floats { + clear: both; +} + +/* Transclude plugin ================================================== */ + +.transclude { + margin: 0; + width: 100%; +} + +/* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ + +/* + * table class="boxed" + * will put a border around the table (but not around the cells) + * + * table class="bordered" + * will put a border around the table and the cells + * + * In both cases, the caption will be bold and centered under the table + * + * In both cases, the headers (th) will have a "#d8d8d8" background + */ + +table.boxed, table.bordered, table.bordered th, table.bordered td { + border-width: 1px; + border-style: solid; + border-collapse: collapse; + vertical-align: top; +} + +table.boxed td, table.bordered td, +table.boxed th, table.bordered th { + padding-left: 5px; + padding-right: 5px; + padding-top: 0; + padding-bottom: 0; +} + +table.boxed caption, table.bordered caption { + text-align: center; + font-weight: bold; + caption-side: bottom; + padding-top: 0.8em; +} + +table.boxed th, table.bordered th { + font-weight: bold; + background-color: #d8d8d8; +} + +table.sortable th.header { + background-image: url(../default/buttons/sort_none.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.sortable th.headerSortUp { + background-image: url(../default/buttons/sort_up.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.sortable th.headerSortDown { + background-image: url(../default/buttons/sort_down.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} Modified: trunk/themes/default/phpwiki.css =================================================================== --- trunk/themes/default/phpwiki.css 2017-10-11 16:21:26 UTC (rev 10054) +++ trunk/themes/default/phpwiki.css 2017-10-12 11:04:53 UTC (rev 10055) @@ -7,6 +7,8 @@ * used to reference the various CalendarPlugin elements. */ +@import url(phpwiki-common.css); + /** * General */ @@ -30,56 +32,6 @@ margin-bottom: .5ex; } -/* generic classes ----------------------------------------------- */ - -.tt { - font-family: monospace; -} - -.strike { - text-decoration: line-through; -} - -.big { - font-size: larger; -} - -.align-left { - text-align: left; -} - -.align-right { - text-align: right; -} - -.align-center { - text-align: center; -} - -.top { - vertical-align: top; -} - -.bottom { - vertical-align: bottom; -} - -.middle { - vertical-align: middle; -} - -.baseline { - vertical-align: baseline; -} - -.nowrap { - white-space: nowrap; -} - -.fullwidth { - width: 100%; -} - /* --------------------------------------------------------------- */ /** @@ -743,14 +695,6 @@ /* * wikiblog */ -.floatleft { - float: left; -} - -.floatright { - float: right; -} - div.wikiblog { margin: 1ex 2em; padding: 0 0; @@ -859,10 +803,6 @@ margin: 1em 0 0.5em 0; } -.clear-floats { - clear: both; -} - /* postnuke css:*/ .gensmall { font-size: 10px @@ -1172,79 +1112,7 @@ padding-right: 1px; } -/* Transclude plugin ================================================== */ - -.transclude { - margin: 0; - width: 100%; -} - -/* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ - -/* - * table class="boxed" - * will put a border around the table (but not around the cells) - * - * table class="bordered" - * will put a border around the table and the cells - * - * In both cases, the caption will be bold and centered under the table - * - * In both cases, the headers (th) will have a "#d8d8d8" background - */ - -table.boxed, table.bordered, table.bordered th, table.bordered td { - border-width: 1px; - border-style: solid; - border-collapse: collapse; - vertical-align: top; -} - -table.boxed td, table.bordered td, -table.boxed th, table.bordered th { - padding-left: 5px; - padding-right: 5px; - padding-top: 0; - padding-bottom: 0; -} - -table.boxed caption, table.bordered caption { - text-align: center; - font-weight: bold; - caption-side: bottom; - padding-top: 0.8em; -} - -table.boxed th, table.bordered th { - font-weight: bold; - background-color: #d8d8d8; -} - #edit-public, h1.firstHeading-public, h1.firstHeading-rating-public { background-color: #ffce7b; border: 1px solid #ffa500; } - -table.sortable th.header { - background-image: url(../default/buttons/sort_none.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortUp { - background-image: url(../default/buttons/sort_up.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortDown { - background-image: url(../default/buttons/sort_down.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} Modified: trunk/themes/fusionforge/fusionforge.css =================================================================== --- trunk/themes/fusionforge/fusionforge.css 2017-10-11 16:21:26 UTC (rev 10054) +++ trunk/themes/fusionforge/fusionforge.css 2017-10-12 11:04:53 UTC (rev 10055) @@ -41,6 +41,8 @@ * ALONE BASIS." */ +@import url(../default/phpwiki-common.css); + /** * General */ @@ -166,30 +168,6 @@ display: inline-block; } -table.sortable th.header { - background-image: url(../default/buttons/sort_none.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortUp { - background-image: url(../default/buttons/sort_up.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortDown { - background-image: url(../default/buttons/sort_down.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - /** * Wiki Forms * @@ -196,7 +174,6 @@ * The div inside the wikiadmin upload form does not * have a class yet, so it must be referenced indirectly */ -/* div.wikiaction, div.wikiadmin { */ div.wikiaction, form.wikiadmin div { border: 1px solid #96a2ae; border-right-color: #d8d8e7; @@ -653,7 +630,6 @@ border: 1px solid #494f5d; border-right-color: #c6d2de; border-bottom-color: #c6d2de; - padding: 0; clear: both; } @@ -927,14 +903,6 @@ /* * wikiblog */ -.floatleft { - float: left; -} - -.floatright { - float: right; -} - div.wikiblog { margin: 1ex 2em; padding: 0 0; @@ -1042,10 +1010,6 @@ margin: 1em 0 0.5em 0; } -.clear-floats { - clear: both; -} - /* postnuke css:*/ .gensmall { font-size: 10px @@ -1208,50 +1172,6 @@ font-style: italic; } -/* Transclude plugin ================================================== */ - -.transclude { - margin: 0; - width: 100%; -} - -/* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ - -/* - * table class="boxed" - * will put a border around the table (but not around the cells) - * - * table class="bordered" - * will put a border around the table and the cells - * - * In both cases, the caption will be bold and centered under the table - * - * In both cases, the headers (th) will have a "#d8d8d8" background - */ - -table.boxed, table.bordered, table.bordered th, table.bordered td { - border: 1px solid; - border-collapse: collapse; - vertical-align: top; -} - -table.boxed td, table.bordered td, -table.boxed th, table.bordered th { - padding: 0 5px; -} - -table.boxed caption, table.bordered caption { - text-align: center; - font-weight: bold; - caption-side: bottom; - padding-top: 0.8em; -} - -table.boxed th, table.bordered th { - font-weight: bold; - background-color: #d8d8d8; -} - /* BoxRight plugin ==================================================== */ div.boxright { Modified: trunk/themes/shamino_com/shamino_com.css =================================================================== --- trunk/themes/shamino_com/shamino_com.css 2017-10-11 16:21:26 UTC (rev 10054) +++ trunk/themes/shamino_com/shamino_com.css 2017-10-12 11:04:53 UTC (rev 10055) @@ -2,6 +2,9 @@ * shamino.com style sheet based on the original Wiki * */ + +@import url(../default/phpwiki-common.css); + body { font-family: sans-serif; font-weight: normal; @@ -148,56 +151,6 @@ text-decoration: underline } -/* generic classes ----------------------------------------------- */ - -.tt { - font-family: monospace; -} - -.strike { - text-decoration: line-through; -} - -.big { - font-size: larger; -} - -.align-left { - text-align: left; -} - -.align-right { - text-align: right; -} - -.align-center { - text-align: center; -} - -.top { - vertical-align: top; -} - -.bottom { - vertical-align: bottom; -} - -.middle { - vertical-align: middle; -} - -.baseline { - vertical-align: baseline; -} - -.nowrap { - white-space: nowrap; -} - -.fullwidth { - width: 100%; -} - /* --------------------------------------------------------------- */ .main { @@ -353,75 +306,3 @@ padding-bottom: 0; margin: 0.5ex 0; } - -/* Transclude plugin ================================================== */ - -.transclude { - margin: 0; - width: 100%; -} - -/* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ - -/* - * table class="boxed" - * will put a border around the table (but not around the cells) - * - * table class="bordered" - * will put a border around the table and the cells - * - * In both cases, the caption will be bold and centered under the table - * - * In both cases, the headers (th) will have a "#d8d8d8" background - */ - -table.boxed, table.bordered, table.bordered th, table.bordered td { - border-width: 1px; - border-style: solid; - border-collapse: collapse; - vertical-align: top; -} - -table.boxed td, table.bordered td, -table.boxed th, table.bordered th { - padding-left: 5px; - padding-right: 5px; - padding-top: 0; - padding-bottom: 0; -} - -table.boxed caption, table.bordered caption { - text-align: center; - font-weight: bold; - caption-side: bottom; - padding-top: 0.8em; -} - -table.boxed th, table.bordered th { - font-weight: bold; - background-color: #d8d8d8; -} - -table.sortable th.header { - background-image: url(../default/buttons/sort_none.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortUp { - background-image: url(../default/buttons/sort_up.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortDown { - background-image: url(../default/buttons/sort_down.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} Modified: trunk/themes/wikilens/wikilens.css =================================================================== --- trunk/themes/wikilens/wikilens.css 2017-10-11 16:21:26 UTC (rev 10054) +++ trunk/themes/wikilens/wikilens.css 2017-10-12 11:04:53 UTC (rev 10055) @@ -44,27 +44,3 @@ img.toolbar:hover { cursor: pointer; } - -table.sortable th.header { - background-image: url(../default/buttons/sort_none.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortUp { - background-image: url(../default/buttons/sort_up.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} - -table.sortable th.headerSortDown { - background-image: url(../default/buttons/sort_down.gif); - cursor: pointer; - background-repeat: no-repeat; - background-position: center right; - padding-right: 20px; -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-01-04 17:19:41
|
Revision: 10225 http://sourceforge.net/p/phpwiki/code/10225 Author: vargenau Date: 2021-01-04 17:19:33 +0000 (Mon, 04 Jan 2021) Log Message: ----------- Remove unused ids Modified Paths: -------------- trunk/themes/MonoBook/templates/navbar.tmpl trunk/themes/Sidebar/templates/navbar.tmpl Modified: trunk/themes/MonoBook/templates/navbar.tmpl =================================================================== --- trunk/themes/MonoBook/templates/navbar.tmpl 2021-01-04 17:15:08 UTC (rev 10224) +++ trunk/themes/MonoBook/templates/navbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) @@ -10,13 +10,13 @@ <h2><?php echo _("Navigation") ?></h2> <div class="pBody"> <ul> - <li id="n-mainpage"><?php echo WikiLink(HOME_PAGE, "",_("Home Page")) ?></li> + <li><?php echo WikiLink(HOME_PAGE, "",_("Home Page")) ?></li> <li><?php $link = WikiLink(_("RecentChanges"), "",_("Recent changes")); $link->addTooltip(_("The list of recent changes in the wiki.")); ?><?php echo $link ?></li> - <li id="n-recentcomments"><?php echo WikiLink(_("RecentComments"), "",_("Recent comments")) ?></li> - <li id="n-recentnewpages"><?php echo WikiLink(_("RecentNewPages"), "",_("Recent new pages")) ?></li> - <li id="n-likepages"><?php echo Button(array('action'=>_("LikePages")),_("Like pages"), $page->getName()) ?></li> - <li id="n-randompage"><?php echo WikiLink(_("RandomPage"), "",_("Random Page")) ?></li> -<li id="n-help"><?php echo WikiLink(_("PhpWikiDocumentation"),"",_("Help")) ?></li> + <li><?php echo WikiLink(_("RecentComments"), "",_("Recent comments")) ?></li> + <li><?php echo WikiLink(_("RecentNewPages"), "",_("Recent new pages")) ?></li> + <li><?php echo Button(array('action'=>_("LikePages")),_("Like pages"), $page->getName()) ?></li> + <li><?php echo WikiLink(_("RandomPage"), "",_("Random Page")) ?></li> + <li><?php echo WikiLink(_("PhpWikiDocumentation"),"",_("Help")) ?></li> </ul> </div> </div> @@ -49,10 +49,10 @@ <div class="pBody"> <ul> <?php if ($revision) { ?> - <li id="t-whatlinkshere"><?php echo Button(array('action'=>_("BackLinks")), _("What links here"), $page->getName()) ?></li> + <li><?php echo Button(array('action'=>_("BackLinks")), _("What links here"), $page->getName()) ?></li> <?php } ?> <?php $links = $page->getPageLinks(); if ($links->count() > 1) { ?> - <li id="t-recentchangeslinked"><?php echo $WikiTheme->makeLinkButton($revision,_("Related changes"),_("RelatedChanges")) ?></li> + <li><?php echo $WikiTheme->makeLinkButton($revision,_("Related changes"),_("RelatedChanges")) ?></li> <?php } ?> <?php if ($user->isAdmin()) { ?> <li><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Administration")) ?></li> Modified: trunk/themes/Sidebar/templates/navbar.tmpl =================================================================== --- trunk/themes/Sidebar/templates/navbar.tmpl 2021-01-04 17:15:08 UTC (rev 10224) +++ trunk/themes/Sidebar/templates/navbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) @@ -9,7 +9,7 @@ <div class="portlet" id="p-navigation"> <div class="_pBody"> <ul> - <li id="n-mainpage"><?php echo WikiLink(HOME_PAGE) ?></li> + <li><?php echo WikiLink(HOME_PAGE) ?></li> <li><?php echo WikiLink("Help:HowToUseWiki","auto","How to use this Wiki") ?></li> <li><?php echo WikiLink("Help:AddingPages","auto","Adding Pages") ?></li> <li><?php echo WikiLink("CategoryCategory","auto","List all Categories") ?></li> @@ -47,7 +47,7 @@ <li><?php $link = WikiLink(_("RecentChanges"), "",_("RecentChanges")); $link->addTooltip(_("The list of recent changes in the wiki.")); ?><?php echo $link ?> </li> <li><?php echo WikiLink(_("RecentNewPages")) ?></li> <?php if (!empty($revision)) { ?> - <li id="t-whatlinkshere"><?php echo Button(array('action'=>_("BackLinks")), _("What links here"), $page->getName()) ?></li> + <li><?php echo Button(array('action'=>_("BackLinks")), _("What links here"), $page->getName()) ?></li> <?php } ?> <?php if (!empty($user) && $user->isSignedIn()) { ?> <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->addTooltip(_("Upload images or media files")); ?><?php echo $link ?></li> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-01-05 09:56:42
|
Revision: 10226 http://sourceforge.net/p/phpwiki/code/10226 Author: vargenau Date: 2021-01-05 09:56:40 +0000 (Tue, 05 Jan 2021) Log Message: ----------- Use "__" where appropriate Modified Paths: -------------- trunk/themes/Crao/templates/actionbar.tmpl trunk/themes/Crao/templates/editpage.tmpl trunk/themes/Crao/templates/navbar.tmpl trunk/themes/MonoBook/templates/actionbar.tmpl trunk/themes/MonoBook/templates/browse-footer.tmpl trunk/themes/MonoBook/templates/info.tmpl trunk/themes/MonoBook/templates/navbar.tmpl trunk/themes/MonoBook/templates/signin.tmpl trunk/themes/Portland/templates/actionbar.tmpl trunk/themes/Portland/templates/editpage.tmpl trunk/themes/Portland/templates/navbar.tmpl trunk/themes/Sidebar/templates/actionbar.tmpl trunk/themes/Sidebar/templates/navbar.tmpl trunk/themes/Sidebar/templates/signin.tmpl trunk/themes/Wordpress/templates/actionbar.tmpl trunk/themes/Wordpress/templates/editpage.tmpl trunk/themes/blog/templates/actionbar.tmpl trunk/themes/blog/templates/info.tmpl trunk/themes/blog/templates/navbar.tmpl trunk/themes/blog/templates/sidebar.tmpl trunk/themes/default/templates/actionbar.tmpl trunk/themes/default/templates/blogform.tmpl trunk/themes/default/templates/editpage.tmpl trunk/themes/default/templates/navbar.tmpl trunk/themes/fusionforge/templates/actionbar.tmpl trunk/themes/shamino_com/templates/actionbar.tmpl trunk/themes/shamino_com/templates/browse-footer.tmpl trunk/themes/smaller/templates/actionbar.tmpl trunk/themes/smaller/templates/info.tmpl trunk/themes/smaller/templates/navbar.tmpl trunk/themes/wikilens/templates/navbar.tmpl Modified: trunk/themes/Crao/templates/actionbar.tmpl =================================================================== --- trunk/themes/Crao/templates/actionbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/Crao/templates/actionbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -17,13 +17,13 @@ <?php if ($user->isAdmin() or mayAccessPage('remove',$page->getName())) { ?> <?php echo $SEP?><?php echo Button('remove') ?> <?php } ?> -<?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?> +<?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?> <?php echo $SEP?><?php echo Button("diff") ?> -<?php echo $SEP?><?php echo Button("PageInfo", _("PageInfo")) ?> +<?php echo $SEP?><?php echo Button(__("PageInfo"), _("Page Info")) ?> <?php if ((DEBUG and $request->getArg('action') == 'browse') || $user->isAdmin()) { ?> <?php // Buttons really only for debugging ?> -<?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?> -<?php echo $SEP?><?php echo Button("PageDump", _("PageDump")) ?> +<?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("DebugBackendInfo")) ?> +<?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?> <?php $purgeb = Button(array('nocache' => 'purge'), _("PurgeHtmlCache"), $page->getName()); $purgeb->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed.")); Modified: trunk/themes/Crao/templates/editpage.tmpl =================================================================== --- trunk/themes/Crao/templates/editpage.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/Crao/templates/editpage.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -56,7 +56,7 @@ <hr /> <div class="wiki-edithelp"> <?php // FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules ?> -<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p> +<p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p> <<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>> </div> <?php echo $HIDDEN_INPUTS?> Modified: trunk/themes/Crao/templates/navbar.tmpl =================================================================== --- trunk/themes/Crao/templates/navbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/Crao/templates/navbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -9,17 +9,17 @@ <div id="navbuttons"> <table class="fullwidth"> <tr class="middle"><td class="align-left"> -<?php echo WikiLink(_("RecentChanges"), "button") ?> +<?php echo WikiLink(__("RecentChanges"), "button") ?> <?php if (!empty($revision)) { ?> -<?php echo $SEP?><?php echo Button("RelatedChanges", _("RelatedChanges")) ?> -<?php echo $SEP?><?php echo Button(_("LikePages"), _("LikePages")) ?> -<?php echo $SEP?><?php echo Button(_("BackLinks"), _("BackLinks")) ?> +<?php echo $SEP?><?php echo Button(__("RelatedChanges"), _("RelatedChanges")) ?> +<?php echo $SEP?><?php echo Button(__("LikePages"), _("LikePages")) ?> +<?php echo $SEP?><?php echo Button(__("BackLinks"), _("BackLinks")) ?> <?php } ?> </td> <td class="align-right; width:150px"> <div id="search"> <?php if (!empty($user) && $user->isSignedIn()) { ?> - <?php echo WikiLink(_("UserPreferences"), 'button', _("Preferences")) ?> + <?php echo WikiLink(__("UserPreferences"), 'button', _("Preferences")) ?> <?php echo $SEP?> <?php } ?> <?php if (!empty($user)) { ?> @@ -35,10 +35,10 @@ <?php echo $SEP?> <?php } ?> <?php if (!empty($user) && $user->isAdmin()) { ?> -<?php echo WikiLink(_("PhpWikiAdministration"), "button", _("Admin")) ?><?php echo $SEP?> +<?php echo WikiLink(__("PhpWikiAdministration"), "button", _("Admin")) ?><?php echo $SEP?> <?php } ?> <?php } ?> -<?php echo WikiLink(_("FindPage"), "button") ?><input type="text" id="livesearch" name="s" size="12" +<?php echo WikiLink(__("FindPage"), "button", _("FindPage")) ?><input type="text" id="livesearch" name="s" size="12" maxlength="256" onfocus="if (this.value == '<?php echo _("Search")?>') {this.value = '';}" onmouseout="window.status=''; return true;" Modified: trunk/themes/MonoBook/templates/actionbar.tmpl =================================================================== --- trunk/themes/MonoBook/templates/actionbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/MonoBook/templates/actionbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -25,7 +25,7 @@ <?php } else { $talk = new WikiPageName($pagename); ?> <?php echo ActionButton(array(),$isActionPage ? _("Action Page") : _("Article"), $talk->getParent(), array('title' => "View the page")) ?> - <?php echo ActionButton(array(),_("Discussion"), $talk->getName(), array('class'=>$isBrowse ? "selected" : "")) ?> + <?php echo ActionButton(array(), _("Discussion"), $talk->getName(), array('class'=>$isBrowse ? "selected" : "")) ?> <?php } ?> <?php if (($isAdmin or mayAccessPage('edit', $pagename)) and $revision) { ?> <?php echo ActionButton("edit", $dbh->isWikiPage($page->getName()) ? ($revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) : _("Create Page"), false, @@ -36,7 +36,7 @@ <?php if ($dbh->isWikiPage($page->getName())) { ?> - <?php echo ActionButton(_("PageHistory"),_("History"),false,array('title'=>"Past versions of this page.")) ?> + <?php echo ActionButton(__("PageHistory"), _("History"), false, array('title'=>"Past versions of this page.")) ?> <?php if (!empty($revision) and ($isAdmin or mayAccessPage('purge', $pagename))) { ?> <?php echo ActionButton("purge") ?> @@ -72,10 +72,10 @@ <?php echo ActionButton('remove') ?> <?php } ?> <?php } ?> - <?php echo ActionButton(array('action'=>_("PageInfo")), _("Page info"), $pagename) ?> - <?php echo ActionButton(array('action'=>_("AuthorHistory")), _("Author history"), $pagename) ?> + <?php echo ActionButton(array('action'=>__("PageInfo")), _("Page Info"), $pagename) ?> + <?php echo ActionButton(array('action'=>__("AuthorHistory")), _("Author history"), $pagename) ?> <?php echo ActionButton("diff") ?> - <?php echo ActionButton(array('action'=>_("PageDump")), _("Page dump"), $pagename) ?> + <?php echo ActionButton(array('action'=>__("PageDump")), _("Page Dump"), $pagename) ?> <?php if (DEBUG and USECACHE) { $PurgeCache = ActionButton(array('nocache' => 'purge'), _("Purge HTML cache"), $pagename); Modified: trunk/themes/MonoBook/templates/browse-footer.tmpl =================================================================== --- trunk/themes/MonoBook/templates/browse-footer.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/MonoBook/templates/browse-footer.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -5,20 +5,20 @@ <ul id="f-list"> <li id="f-lastmod"> <?php echo $WikiTheme->getOwnerMessage($page) ?> <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?> </li> <li id="f-copyright">All text is available under the terms of the <a class="internal" href="http://www.gnu.org/copyleft/fdl.html">GNU Free Documentation License</a> (see <b> -<?php if ($request->_dbi->isWikiPage(_("Copyrights"))) { ?> - <?php echo WikiLink(_("Copyrights")) ?> +<?php if ($request->_dbi->isWikiPage(__("Copyrights"))) { ?> + <?php echo WikiLink(__("Copyrights")) ?> <?php } else { ?> <a class="internal" href="http://phpwiki.demo.free.fr/index.php/Copyrights">Copyrights</a> <?php } ?> </b> for details).<br /></li> -<?php if ($request->_dbi->isWikiPage(_("About".WIKI_NAME))) { ?> - <?php echo WikiLink(_("About".WIKI_NAME)) ?> +<?php if ($request->_dbi->isWikiPage(__("About").WIKI_NAME)) { ?> + <?php echo WikiLink(_("About").WIKI_NAME) ?> <?php } else { ?> <li id="f-about"><a href="http://phpwiki.demo.free.fr/index.php/Help/PhpWiki">About PhpWiki</a></li> <?php } ?> <li id="f-disclaimer"> -<?php if ($request->_dbi->isWikiPage(_("GeneralDisclaimer"))) { ?> - <?php echo WikiLink(_("GeneralDisclaimer")) ?> +<?php if ($request->_dbi->isWikiPage(__("GeneralDisclaimer"))) { ?> + <?php echo WikiLink(__("GeneralDisclaimer")) ?> <?php } else { ?> <a href="http://phpwiki.demo.free.fr/index.php/GeneralDisclaimer">Disclaimer</a> <?php } ?> Modified: trunk/themes/MonoBook/templates/info.tmpl =================================================================== --- trunk/themes/MonoBook/templates/info.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/MonoBook/templates/info.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -169,14 +169,14 @@ <div id="actionbuttons"> <?php echo Button("viewsource", _("View Source")) ?> - <?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?> - <?php echo $SEP?><?php echo Button("AuthorHistory", _("AuthorHistory")) ?> + <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?> + <?php echo $SEP?><?php echo Button(__("AuthorHistory"), _("AuthorHistory")) ?> <?php echo $SEP?><?php echo Button("Diff") ?> <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?> <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?> <?php if ((defined('DEBUG') && DEBUG) || $user->isAdmin()) { ?> <?php // Buttons really only for debugging ?> - <?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?> + <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("DebugBackendInfo")) ?> <?php $PurgeCache = Button(array('nocache' => 'purge'), _("PurgeHtmlCache"), $page->getName()); Modified: trunk/themes/MonoBook/templates/navbar.tmpl =================================================================== --- trunk/themes/MonoBook/templates/navbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/MonoBook/templates/navbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -10,13 +10,13 @@ <h2><?php echo _("Navigation") ?></h2> <div class="pBody"> <ul> - <li><?php echo WikiLink(HOME_PAGE, "",_("Home Page")) ?></li> - <li><?php $link = WikiLink(_("RecentChanges"), "",_("Recent changes")); $link->addTooltip(_("The list of recent changes in the wiki.")); ?><?php echo $link ?></li> - <li><?php echo WikiLink(_("RecentComments"), "",_("Recent comments")) ?></li> - <li><?php echo WikiLink(_("RecentNewPages"), "",_("Recent new pages")) ?></li> - <li><?php echo Button(array('action'=>_("LikePages")),_("Like pages"), $page->getName()) ?></li> - <li><?php echo WikiLink(_("RandomPage"), "",_("Random Page")) ?></li> - <li><?php echo WikiLink(_("PhpWikiDocumentation"),"",_("Help")) ?></li> + <li><?php echo WikiLink(HOME_PAGE, "", _("Home Page")) ?></li> + <li><?php $link = WikiLink(__("RecentChanges"), "", _("Recent changes")); $link->addTooltip(_("The list of recent changes in the wiki.")); ?><?php echo $link ?></li> + <li><?php echo WikiLink(__("RecentComments"), "", _("Recent comments")) ?></li> + <li><?php echo WikiLink(__("RecentNewPages"), "", _("Recent new pages")) ?></li> + <li><?php echo Button(array('action'=>__("LikePages")),_("Like pages"), $page->getName()) ?></li> + <li><?php echo WikiLink(__("RandomPage"), "", _("Random Page")) ?></li> + <li><?php echo WikiLink(__("PhpWikiDocumentation"),"", _("Help")) ?></li> </ul> </div> </div> @@ -26,13 +26,13 @@ <h2><?php echo _("Search") ?></h2> <div class="pBody"> <?php echo Template("search", - array('SEARCH_BEFORE' => WikiLink(_("FindPage"), "",_("Find page")), + array('SEARCH_BEFORE' => WikiLink(__("FindPage"), "", _("Find page")), 'SEARCH_AFTER' => HTML::input(array('id' => 'searchGoButton', 'type'=>'submit', 'value'=>_("Go"))))) ?> <!-- <form action="<?php echo WikiURL(_("TitleSearch"))?>" method="get" accept-charset="UTF-8"> - <?php echo WikiLink(_("FindPage"), "searchButton",_("Search:")) ?> + <?php echo WikiLink(__("FindPage"), "searchButton", _("Search:")) ?> <input type="hidden" name="auto_redirect" value="1" /> <input type="text" name="s" size="12" maxlength="256" title='<?php echo _("Quick Search")?>' @@ -49,16 +49,16 @@ <div class="pBody"> <ul> <?php if ($revision) { ?> - <li><?php echo Button(array('action'=>_("BackLinks")), _("What links here"), $page->getName()) ?></li> + <li><?php echo Button(array('action'=>__("BackLinks")), _("What links here"), $page->getName()) ?></li> <?php } ?> <?php $links = $page->getPageLinks(); if ($links->count() > 1) { ?> - <li><?php echo $WikiTheme->makeLinkButton($revision,_("Related changes"),_("RelatedChanges")) ?></li> + <li><?php echo $WikiTheme->makeLinkButton($revision, _("Related changes"), __("RelatedChanges")) ?></li> <?php } ?> <?php if ($user->isAdmin()) { ?> - <li><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Administration")) ?></li> + <li><?php echo WikiLink(__("PhpWikiAdministration"), "", _("Administration")) ?></li> <?php } ?> <?php if ($user->isSignedIn()) { ?> - <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->addTooltip(_("Upload images or media files")); ?><?php echo $link ?></li> + <li><?php $link = WikiLink(__("UpLoad"), "", _("Upload File")); $link->addTooltip(_("Upload images or media files")); ?><?php echo $link ?></li> <?php } ?> <?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?> <script type="text/javascript"><!-- @@ -70,7 +70,7 @@ ?> <li><?php echo $btn ?></li> <?php } ?> - <li><?php echo WikiLink(_("AllPages"), "",_("All pages")) ?></li> + <li><?php echo WikiLink(__("AllPages"), "", _("All pages")) ?></li> </ul> </div> </div> Modified: trunk/themes/MonoBook/templates/signin.tmpl =================================================================== --- trunk/themes/MonoBook/templates/signin.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/MonoBook/templates/signin.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -5,9 +5,9 @@ <ul> <?php if ($user->isAuthenticated()) { ?> <li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li> - <li><?php echo WikiLink($id . "/Discussion", 'auto' ,_("My Discussion")) ?></li> - <li><?php echo WikiLink(_("UserPreferences"), "",_("My Preferences")) ?></li> - <li><?php echo WikiLink(_("MyRecentChanges"), "",_("My Changes")) ?></li> + <li><?php echo WikiLink($id . "/Discussion", 'auto' , _("My Discussion")) ?></li> + <li><?php echo WikiLink(__("UserPreferences"), "", _("My Preferences")) ?></li> + <li><?php echo WikiLink(__("MyRecentChanges"), "", _("My Changes")) ?></li> <li><?php echo HTML::a(array('href'=>'?'.urlencode('auth[logout]').'=1'),$sp,_("Logout"),$sp) ?></li> <?php } else { ?> <?php // Login or Register ?> Modified: trunk/themes/Portland/templates/actionbar.tmpl =================================================================== --- trunk/themes/Portland/templates/actionbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/Portland/templates/actionbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -9,9 +9,9 @@ ?> <?php echo $EditB ?> <a href="<?php echo WikiURL($revision,array('action'=>'diff'))?>"><?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a> - <?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?> - <?php echo $SEP?><?php echo Button("PageInfo", _("PageInfo")) ?> + <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?> + <?php echo $SEP?><?php echo Button(__("PageInfo"), _("Page Info")) ?> <?php if (defined('DEBUG') && DEBUG || $user->isAdmin()) { ?> - <?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?> <?php // For debugging only, really ?> + <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("DebugBackendInfo")) ?> <?php // For debugging only, really ?> <?php } ?> <br /> Modified: trunk/themes/Portland/templates/editpage.tmpl =================================================================== --- trunk/themes/Portland/templates/editpage.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/Portland/templates/editpage.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -26,7 +26,7 @@ <br /> <?php echo $MINOR_EDIT_CB ?> <?php echo fmt("I'm just doing minor edits. Please divert the usual logging to %s instead.", - WikiLink(_("RecentEdits"))) ?> + WikiLink(__("RecentEdits"))) ?> <br /> <?php if (isset($PREVIEW_CONTENT)) { ?> <hr /> @@ -37,7 +37,7 @@ <div class="wiki-edithelp"> <?php // FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules ?> -<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p> +<p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p> <<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>> </div> <?php echo $HIDDEN_INPUTS?> Modified: trunk/themes/Portland/templates/navbar.tmpl =================================================================== --- trunk/themes/Portland/templates/navbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/Portland/templates/navbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -1,12 +1,12 @@ <nav role="navigation" aria-label="<?php echo _("Main Menu") ?>"> <?php // The bottom navigation/search bar ?> - <?php echo WikiLink(_("FindPage"), "button") ?> by searching + <?php echo WikiLink(__("FindPage"), "button") ?> by searching <?php if ($revision) { ?> - (or browse <?php echo Button(_("LikePages"), _("LikePages")) ?>) + (or browse <?php echo Button(__("LikePages"), _("LikePages")) ?>) <?php } ?> <?php if ($user->isAdmin()) { ?> - <?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock')?> + <?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock') ?> <?php echo $SEP?><?php echo Button('remove') ?> <?php } ?> <hr /> @@ -13,9 +13,9 @@ <table class="toolbar fullwidth" id="actionbar"> <tr class="baseline"> <td> - <?php echo WikiLink(_("RecentChanges"), "button") ?> + <?php echo WikiLink(__("RecentChanges"), "button") ?> <?php if ($user->isAdmin()) { ?> - <?php echo $SEP?><?php echo WikiLink(_("PhpWikiAdministration"), "button") ?> + <?php echo $SEP?><?php echo WikiLink(__("PhpWikiAdministration"), "button") ?> <?php } ?> </td> <td class="align-right"> Modified: trunk/themes/Sidebar/templates/actionbar.tmpl =================================================================== --- trunk/themes/Sidebar/templates/actionbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/Sidebar/templates/actionbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -23,10 +23,10 @@ <?php } elseif ($page->exists()) { ?> <?php echo ActionButton("viewsource", _("View Source")) ?> <?php } ?> - <?php echo ActionButton(_("PageHistory"),_("History"),false,array('title'=>_("Past versions of this page."))) ?> + <?php echo ActionButton(__("PageHistory"), _("History"), false, array('title'=>_("Past versions of this page."))) ?> <?php echo ActionButton("diff") ?> <?php if ($user->isSignedIn()) { ?> - <?php echo ActionButton(_("WatchPage"), _("Watch"), false, + <?php echo ActionButton(__("WatchPage"), _("Watch"), false, array('title'=>_("Add/Remove this to/from the list of pages you're monitoring for changes"))) ?> <?php } ?> </ul> @@ -54,12 +54,12 @@ <?php echo ActionButton('setacl') ?> <?php }} ?> <?php echo ActionButton("viewsource", _("View Source")) ?> - <?php echo ActionButton(array('action'=>'PageInfo'), _("PageInfo"), $pagename) ?> - <?php echo ActionButton(_("AuthorHistory")) ?> - <?php echo ActionButton(_("PageHistory")) ?> + <?php echo ActionButton(array('action'=>__('PageInfo')), _("Page Info"), $pagename) ?> + <?php echo ActionButton(__("AuthorHistory"), _("AuthorHistory")) ?> + <?php echo ActionButton(__("PageHistory"), _("PageHistory")) ?> <?php echo ActionButton("diff") ?> <?php if ($isAdmin) { ?> - <?php echo ActionButton(_("PageDump")) ?> + <?php echo ActionButton(__("PageDump"), _("Page Dump")) ?> <?php if (USECACHE) { ?> <?php echo ActionButton(array('nocache' => 'purge'), _("PurgeHtmlCache"), $pagename, array('title'=>_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."))) ?> Modified: trunk/themes/Sidebar/templates/navbar.tmpl =================================================================== --- trunk/themes/Sidebar/templates/navbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/Sidebar/templates/navbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -10,9 +10,9 @@ <div class="_pBody"> <ul> <li><?php echo WikiLink(HOME_PAGE) ?></li> - <li><?php echo WikiLink("Help:HowToUseWiki","auto","How to use this Wiki") ?></li> - <li><?php echo WikiLink("Help:AddingPages","auto","Adding Pages") ?></li> - <li><?php echo WikiLink("CategoryCategory","auto","List all Categories") ?></li> + <li><?php echo WikiLink("Help:HowToUseWiki", "auto", "How to use this Wiki") ?></li> + <li><?php echo WikiLink("Help:AddingPages", "auto", "Adding Pages") ?></li> + <li><?php echo WikiLink("CategoryCategory", "auto", "List all Categories") ?></li> </ul> </div> </div> @@ -23,8 +23,8 @@ <h2><?php echo _("Main Categories")?></h2> <div class="pBody"> <ul> - <li><?php echo WikiLink("CategoryWikiPlugin") ?></li> - <li><?php echo WikiLink("CategoryActionPage") ?></li> + <li><?php echo WikiLink(__("CategoryWikiPlugin")) ?></li> + <li><?php echo WikiLink(__("CategoryActionPage")) ?></li> </ul> </div> </div> @@ -34,7 +34,7 @@ <h2><?php echo _("Search")?></h2> <div class="pBody"> <?php echo Template("search", - array('SEARCH_BEFORE' => ''/*HTML::h2(WikiLink(_("FindPage")))*/, + array('SEARCH_BEFORE' => ''/*HTML::h2(WikiLink(__("FindPage")))*/, 'SEARCH_AFTER' => HTML::raw('<br /><input type="submit" name="searchtype" value="title" class="searchButton" title="Press to perform a wiki title search" /> <input type="submit" name="searchtype" value="fulltext" class="searchButton" title="Wiki fulltext search" />'))) ?> </div> </div> @@ -44,14 +44,14 @@ <h2><?php echo _("Toolbox") ?><?php echo $WikiTheme->folderArrow('p-tb', 'Open') ?></h2> <div class="pBody" id="p-tb-body"> <ul> - <li><?php $link = WikiLink(_("RecentChanges"), "",_("RecentChanges")); $link->addTooltip(_("The list of recent changes in the wiki.")); ?><?php echo $link ?> </li> - <li><?php echo WikiLink(_("RecentNewPages")) ?></li> + <li><?php $link = WikiLink(__("RecentChanges"), "", _("Recent Changes")); $link->addTooltip(_("The list of recent changes in the wiki.")); ?><?php echo $link ?> </li> + <li><?php echo WikiLink(__("RecentNewPages")) ?></li> <?php if (!empty($revision)) { ?> - <li><?php echo Button(array('action'=>_("BackLinks")), _("What links here"), $page->getName()) ?></li> + <li><?php echo Button(array('action'=>__("BackLinks")), _("What links here"), $page->getName()) ?></li> <?php } ?> <?php if (!empty($user) && $user->isSignedIn()) { ?> - <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->addTooltip(_("Upload images or media files")); ?><?php echo $link ?></li> - <li><?php echo WikiLink(_("UserPreferences"), "",_("Preferences")) ?></li> + <li><?php $link = WikiLink(__("UpLoad"), "", _("Upload File")); $link->addTooltip(_("Upload images or media files")); ?><?php echo $link ?></li> + <li><?php echo WikiLink(__("UserPreferences"), "", _("Preferences")) ?></li> <?php } ?> <?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?> <script type="text/javascript"><!-- @@ -61,11 +61,11 @@ // Do not display the pdf icon $btn = new Button(_("Display as Pdf"), WikiURL($page->getName(), array('action' => 'pdf')), 'wikiaction'); ?> - <li><?php echo $btn ?> <?php echo WikiLink("Help:PDF","",HTML::img(array('src'=>$WikiTheme->_findData('images/mini_help.png'),'width'=>12,'height'=>13,'alt'=>'PDF help','title'=>'PDF help'))) ?></li> + <li><?php echo $btn ?> <?php echo WikiLink("Help:PDF", "", HTML::img(array('src'=>$WikiTheme->_findData('images/mini_help.png'),'width'=>12,'height'=>13,'alt'=>'PDF help','title'=>'PDF help'))) ?></li> <?php } ?> - <li><?php echo WikiLink(_("AllPages")) ?></li> + <li><?php echo WikiLink(__("AllPages"), "", _("All pages")) ?></li> <?php if (!empty($user) && $user->isAdmin()) { ?> - <li><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Administration")) ?></li> + <li><?php echo WikiLink(__("PhpWikiAdministration"), "", _("Administration")) ?></li> <?php } ?> </ul> </div> Modified: trunk/themes/Sidebar/templates/signin.tmpl =================================================================== --- trunk/themes/Sidebar/templates/signin.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/Sidebar/templates/signin.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -2,8 +2,8 @@ <div class="portlet" id="p-personal"><div class="pBody"><ul> <?php if ($user->isAuthenticated()) { $sp = HTML::raw(" "); $id = $user->getAuthenticatedId(); ?> - <li id="pt-mypages"><?php echo WikiLink("RecentChangesMyPages", 'auto', HTML($sp,"MyPages",$sp)) ?></li> - <li id="pt-mychanges"><?php echo WikiLink("MyRecentChanges", 'auto', HTML($sp,"MyChanges",$sp)) ?></li> + <li id="pt-mypages"><?php echo WikiLink(__("RecentChangesMyPages"), 'auto', HTML($sp,"MyPages",$sp)) ?></li> + <li id="pt-mychanges"><?php echo WikiLink(__("MyRecentChanges"), 'auto', HTML($sp,"MyChanges",$sp)) ?></li> <li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li> <li id="pt-logout"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[logout]').'=1'), $sp,_("Logout"),$sp) ?></li> <?php } elseif (ALLOW_ANON_USER) { Modified: trunk/themes/Wordpress/templates/actionbar.tmpl =================================================================== --- trunk/themes/Wordpress/templates/actionbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/Wordpress/templates/actionbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -15,14 +15,14 @@ <li><a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>"><?php echo WIKI_NAME ?></a> <ul> <li> - <?php echo WikiLink(_("HomePage"), "button") ?> + <?php echo WikiLink(__("HomePage"), "button") ?> </li> <li> - <?php echo WikiLink(_("RecentChanges"), "button") ?> + <?php echo WikiLink(__("RecentChanges"), "button") ?> </li> <?php if (!empty($user) && $user->isAdmin()) { ?> <li> - <?php echo $SEP?><?php echo WikiLink(_("PhpWikiAdministration"), "button") ?> + <?php echo $SEP?><?php echo WikiLink(__("PhpWikiAdministration"), "button") ?> </li> <?php } ?> <?php if (!empty($user)) { ?> @@ -54,7 +54,7 @@ <?php } ?> <?php } ?> <?php if ($user->isAdmin() or mayAccessPage('remove', $page->getName())) { ?> - <li><?php echo $SEP?><?php echo Button('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?></li> + <li><?php echo $SEP?><?php echo Button('revert', _("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?></li> <li><?php echo $SEP?><?php echo Button('remove') ?></li> <?php } ?> </ul> @@ -66,13 +66,13 @@ <?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a> </li> <li> - <?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?><?php echo $SEP?> + <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?><?php echo $SEP?> </li> - <li> <?php echo Button("PageInfo", _("PageInfo")) ?> </li> + <li> <?php echo Button(__("PageInfo"), _("Page Info")) ?> </li> <?php if ((DEBUG and $request->getArg('action') == 'browse') || $user->isAdmin()) { ?> <li> - <?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?> <?php // For debugging only, really ?> - <?php echo $SEP?><?php echo Button("PageDump", _("PageDump")) ?> + <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("DebugBackendInfo")) ?> <?php // For debugging only, really ?> + <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?> </li> <?php } ?> </ul> @@ -87,7 +87,7 @@ </li> <li> <?php if ($revision) { ?> - <?php echo Button(_("LikePages"), _("LikePages")) ?> + <?php echo Button(__("LikePages"), _("LikePages")) ?> <?php } ?> </li> </ul> Modified: trunk/themes/Wordpress/templates/editpage.tmpl =================================================================== --- trunk/themes/Wordpress/templates/editpage.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/Wordpress/templates/editpage.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -39,7 +39,7 @@ <?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"> <?php echo fmt("I'm just doing minor edits. Please divert the usual logging to %s instead.", - WikiLink(_("RecentEdits"))) ?></label> + WikiLink(__("RecentEdits"))) ?></label> <br /> <?php if ($user->isAdmin()) { ?> <?php echo $SEP?><?php echo $LOCKED_CB ?> <label for="edit-locked"><?php echo _("Locked")?></label> @@ -54,7 +54,7 @@ <div class="wiki-edithelp"> <?php // FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules ?> -<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p> +<p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p> <<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>> </div> <?php echo $HIDDEN_INPUTS?> Modified: trunk/themes/blog/templates/actionbar.tmpl =================================================================== --- trunk/themes/blog/templates/actionbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/blog/templates/actionbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -3,16 +3,16 @@ <td> <div class="actionbuttons"> <?php echo WikiLink(HOME_PAGE, "known",_("Home")) ?> - <?php echo $SEP?><?php echo WikiLink(_("About")) ?> - <?php echo $SEP?><?php echo WikiLink(_("BlogArchives"),'',_("Archives")) ?> - <?php echo $SEP?><?php echo WikiLink(_("PhotoAlbum")) ?> - <?php echo $SEP?><?php echo WikiLink(_("HowTo")) ?> - <?php echo $SEP?><?php echo WikiLink(_("RecentChanges")) ?> - <?php echo $SEP?><?php echo Button("PageInfo", _("Info")) ?> + <?php echo $SEP?><?php echo WikiLink(__("About")) ?> + <?php echo $SEP?><?php echo WikiLink(__("BlogArchives"), '', _("Archives")) ?> + <?php echo $SEP?><?php echo WikiLink(__("PhotoAlbum")) ?> + <?php echo $SEP?><?php echo WikiLink(__("HowTo")) ?> + <?php echo $SEP?><?php echo WikiLink(__("RecentChanges")) ?> + <?php echo $SEP?><?php echo Button(__("PageInfo"), _("Info")) ?> <?php if ($user->isAuthenticated()) { if (mayAccessPage('edit', $page->getName())) - $EditB = Button("edit",_("Edit"),false,array('id'=>'btn-edit')); + $EditB = Button("edit", _("Edit"), false, array('id'=>'btn-edit')); else $EditB = Button("viewsource", _("View Source")); ?> Modified: trunk/themes/blog/templates/info.tmpl =================================================================== --- trunk/themes/blog/templates/info.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/blog/templates/info.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -1,6 +1,6 @@ <?php echo Template("default/info") ?> <div class="actionbuttons"> - <?php echo $SEP?><?php echo Button("AuthorHistory", _("AuthorHistory")) ?> + <?php echo $SEP?><?php echo Button(__("AuthorHistory"), _("AuthorHistory")) ?> <?php echo $SEP?><?php echo Button("Diff") ?> <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?> <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?> Modified: trunk/themes/blog/templates/navbar.tmpl =================================================================== --- trunk/themes/blog/templates/navbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/blog/templates/navbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -7,13 +7,13 @@ <div class="box-data"> <ul> <?php if (!empty($revision)) { ?> -<li><?php echo WikiLink(_("BackLinks"), "button",_("BackLinks")) ?></li> +<li><?php echo WikiLink(__("BackLinks"), "button",_("BackLinks")) ?></li> <?php } ?> <?php if (!empty($user) && $user->isAdmin()) { ?> -<li><?php echo WikiLink(_("PhpWikiAdministration"), "button", _("Admin")) ?></li> +<li><?php echo WikiLink(__("PhpWikiAdministration"), "button", _("Admin")) ?></li> <?php } ?> <?php if (!empty($user) && $user->isSignedIn()) { ?> -<li><?php echo WikiLink(_("UserPreferences"), "","Preferences") ?></li> +<li><?php echo WikiLink(__("UserPreferences"), "", _("Preferences")) ?></li> <?php } ?> </ul> <?php echo Template("blog/signin") ?> Modified: trunk/themes/blog/templates/sidebar.tmpl =================================================================== --- trunk/themes/blog/templates/sidebar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/blog/templates/sidebar.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -9,7 +9,7 @@ } ?> <div class="box"> -<div class="box-title"><?php echo WikiLink($UserCalPageTitle,'known',_("Calendar")) ?></div> +<div class="box-title"><?php echo WikiLink($UserCalPageTitle, 'known', _("Calendar")) ?></div> <div class="box-data"> <?php echo Template('calendar') ?> </div></div> Modified: trunk/themes/default/templates/actionbar.tmpl =================================================================== --- trunk/themes/default/templates/actionbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/default/templates/actionbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -20,16 +20,16 @@ <?php echo $SEP?><?php echo Button('rename') ?> <?php }} ?> <?php if ($revision and ($user->isAdmin() or mayAccessPage('remove', $page->getName()))) { ?> - <?php echo $SEP?><?php echo Button('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?> + <?php echo $SEP?><?php echo Button('revert', _("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?> <?php echo $SEP?><?php echo Button('remove') ?> <?php } ?> - <?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?> + <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?> <?php echo $SEP?><?php echo Button("diff") ?> - <?php echo $SEP?><?php echo Button("PageInfo", _("PageInfo")) ?> + <?php echo $SEP?><?php echo Button(__("PageInfo"), _("Page Info")) ?> <?php if ((DEBUG and $request->getArg('action') == 'browse') || $user->isAdmin()) { ?> <?php // Buttons really only for debugging ?> - <?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?> - <?php echo $SEP?><?php echo Button("PageDump", _("PageDump")) ?> + <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("DebugBackendInfo")) ?> + <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?> <?php if (DEBUG & _DEBUG_SQL and USECACHE) { $PurgeCache = Button(array('nocache' => 'purge'), @@ -41,7 +41,7 @@ <?php // End debugging buttons ?> <?php } ?> <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?> - <?php echo $SEP?><?php echo Button("pdf","Pdf",'wikiclear',array('id'=>'btn-pdf')) ?> + <?php echo $SEP?><?php echo Button("pdf", "Pdf", 'wikiclear', array('id'=>'btn-pdf')) ?> <?php } ?> </div> </td> Modified: trunk/themes/default/templates/blogform.tmpl =================================================================== --- trunk/themes/default/templates/blogform.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/default/templates/blogform.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -21,7 +21,7 @@ <hr /> <div class="wiki-edithelp"> - <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p> + <p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p> <<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>> </div> <?php echo $HIDDEN_INPUTS?> Modified: trunk/themes/default/templates/editpage.tmpl =================================================================== --- trunk/themes/default/templates/editpage.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/default/templates/editpage.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -74,6 +74,6 @@ <hr /> <div class="wiki-edithelp"> <?php // FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules ?> -<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p> +<p><?php echo fmt("See %s tips for editing.", WikiLink(__("Help")."/".__("GoodStyle"))) ?></p> <<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>> </div> Modified: trunk/themes/default/templates/navbar.tmpl =================================================================== --- trunk/themes/default/templates/navbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/default/templates/navbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -7,21 +7,21 @@ <?php echo $SEP?><?php echo WikiLink(new WikiPagename('Talk:'.$page->getName(), $page->getName()), 'button', _("Discussion")) ?> <?php } else { ?> - <?php echo $SEP?><?php echo Button(array(),_("Article"),$page->getName()) ?> + <?php echo $SEP?><?php echo Button(array(),_("Article"), $page->getName()) ?> <?php } ?> <?php echo $SEP?> <?php } ?> -<?php echo WikiLink(_("RecentChanges"), "button") ?> +<?php echo WikiLink(__("RecentChanges"), "button") ?> <?php echo $SEP?><?php echo Template('search', array('SEARCH_BEFORE' => HTML::button(_("FindPage")))) ?> <?php if (!empty($revision)) { ?> -<?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("LikePages"), _("LikePages")) ?> -<?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("BackLinks"), _("BackLinks")) ?> +<?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("LikePages"), __("LikePages")) ?> +<?php echo $SEP?><?php echo $WikiTheme->makeLinkButton($revision,_("BackLinks"), __("BackLinks")) ?> <?php } ?> <?php if (!empty($user) && $user->isSignedIn()) { ?> <?php echo $SEP?> -<?php echo WikiLink(_("UserPreferences"), 'button', _("Preferences")) ?> +<?php echo WikiLink(__("UserPreferences"), 'button', _("Preferences")) ?> <?php } ?> <?php if (!empty($user)) { ?> <?php @@ -37,7 +37,7 @@ <?php } ?> <?php } ?> <?php if (!empty($user) && $user->isAdmin()) { ?> -<?php echo $SEP?><?php echo WikiLink(_("PhpWikiAdministration"), "button", _("Admin")) ?> +<?php echo $SEP?><?php echo WikiLink(__("PhpWikiAdministration"), "button", _("Admin")) ?> <?php } ?></div> <?php if (DEBUG & 2) { if (isset($links)) { Modified: trunk/themes/fusionforge/templates/actionbar.tmpl =================================================================== --- trunk/themes/fusionforge/templates/actionbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/fusionforge/templates/actionbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -67,7 +67,7 @@ <li><?php echo Button(__("PageInfo"), _("Page Info")) ?></li> - <li><?php echo Button(array('action'=>__("BackLinks")), _("Back Links"),$page->getName()) ?></li> + <li><?php echo Button(array('action'=>__("BackLinks")), _("Back Links"), $page->getName()) ?></li> <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?> <?php if ($curuserprefs->get('pdfMenuItem')) { ?> Modified: trunk/themes/shamino_com/templates/actionbar.tmpl =================================================================== --- trunk/themes/shamino_com/templates/actionbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/shamino_com/templates/actionbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -2,7 +2,7 @@ <?php if (empty($revision)) $revision = $page->getCurrentRevision(false); ?> -<?php echo Button(array('action'=>'PageInfo'),_("PageInfo"),$page->getName()) ?> +<?php echo Button(array('action'=>__('PageInfo')), _("Page Info"),$page->getName()) ?> <?php echo $SEP?><?php echo Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) ?> <?php if ($user->isAdmin() or mayAccessPage('change',$page->getName())) { ?> <?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock') ?> @@ -15,11 +15,11 @@ <?php echo $SEP?><?php echo Button('remove') ?> <?php } ?> <?php if (!empty($user) && $user->isAdmin()) { ?> - <?php echo $SEP?><?php echo WikiLink(_("PhpWikiAdministration"), "","Admin") ?> + <?php echo $SEP?><?php echo WikiLink(__("PhpWikiAdministration"), "", _("Admin")) ?> <?php // Buttons really only for debugging. See info for more ?> - <?php echo $SEP?><?php echo Button(_("PageHistory")) ?> + <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?> <?php echo $SEP?><?php echo Button("diff") ?> - <?php echo $SEP?><?php echo Button(_("PageDump")) ?> + <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?> <?php // End debugging buttons ?> <?php } ?> </nav> Modified: trunk/themes/shamino_com/templates/browse-footer.tmpl =================================================================== --- trunk/themes/shamino_com/templates/browse-footer.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/shamino_com/templates/browse-footer.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -5,5 +5,5 @@ <?php } ?> <span class="editdate"><?php echo $WikiTheme->getOwnerMessage($page) ?> <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?></span> <br /> -<a href="<?php echo PHPWIKI_BASE_URL ?>"><?php echo WIKI_NAME?></a> created with <a href="http://phpwiki.demo.free.fr">PhpWiki</a> © 1998-2007 | <?php echo WikiLink(_("TermsOfUse")) ?> +<a href="<?php echo PHPWIKI_BASE_URL ?>"><?php echo WIKI_NAME?></a> created with <a href="http://phpwiki.demo.free.fr">PhpWiki</a> © 1998-2007 | <?php echo WikiLink(__("TermsOfUse")) ?> </div> Modified: trunk/themes/smaller/templates/actionbar.tmpl =================================================================== --- trunk/themes/smaller/templates/actionbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/smaller/templates/actionbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -26,12 +26,12 @@ <?php } ?> <?php echo $SEP?> <?php } ?> - <?php echo Button(array('action'=>'PageInfo'),_("Info"), $page->getName()) ?> + <?php echo Button(array('action'=>__('PageInfo')), _("Info"), $page->getName()) ?> <?php if (((defined('DEBUG') and DEBUG and $request->getArg('action') == 'browse')) || $user->isAdmin()) { ?> <?php // Buttons really only for debugging ?> - <?php echo $SEP?><?php echo Button(_("PageHistory")) ?> + <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?> <?php echo $SEP?><?php echo Button("diff") ?> - <?php echo $SEP?><?php echo Button(_("PageDump")) ?> + <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?> <?php // End debugging buttons ?> <?php } ?> <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?> Modified: trunk/themes/smaller/templates/info.tmpl =================================================================== --- trunk/themes/smaller/templates/info.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/smaller/templates/info.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -2,15 +2,15 @@ <div id="actionbuttons"> <?php echo Button("viewsource", _("View Source")) ?> - <?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?> - <?php echo $SEP?><?php echo Button("AuthorHistory", _("AuthorHistory")) ?> + <?php echo $SEP?><?php echo Button(__("PageHistory"), _("PageHistory")) ?> + <?php echo $SEP?><?php echo Button(__("AuthorHistory"), _("AuthorHistory")) ?> <?php echo $SEP?><?php echo Button("Diff") ?> <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?> <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?> - <?php echo $SEP?><?php echo Button("PageDump", _("PageDump")) ?> + <?php echo $SEP?><?php echo Button(__("PageDump"), _("Page Dump")) ?> <?php if ((defined('DEBUG') && DEBUG) || $user->isAdmin()) { ?> <?php // Buttons really only for debugging ?> - <?php echo $SEP?><?php echo Button("DebugBackendInfo", _("DebugBackendInfo")) ?> + <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("DebugBackendInfo")) ?> <?php $PurgeCache = Button(array('nocache' => 'purge'), _("PurgeHtmlCache"), $page->getName()); Modified: trunk/themes/smaller/templates/navbar.tmpl =================================================================== --- trunk/themes/smaller/templates/navbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/smaller/templates/navbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -3,8 +3,8 @@ <form action="<?php echo WikiURL(_("TitleSearch"))?>" method="get" accept-charset="UTF-8"> <div id="navbuttons"> - <?php echo WikiLink(_("RecentChanges"), "","News") ?> - <?php echo $SEP?><?php echo WikiLink(_("FindPage"), "","Search:") ?> + <?php echo WikiLink(__("RecentChanges"), "", _("News")) ?> + <?php echo $SEP?><?php echo WikiLink(__("FindPage"), "", _("Search")._(":")) ?> <input type="hidden" name="auto_redirect" value="1" /> <input type="text" name="s" size="12" maxlength="256" title='<?php echo _("Quick Search")?>' @@ -11,14 +11,14 @@ onmouseover="window.status='<?php echo _("Quick Search")?>'; return true;" onmouseout="window.status=''; return true;" /> <?php if (!empty($revision)) { ?> - <?php echo $SEP?><?php echo Button(array('action'=>_("LikePages")),_("LikePages"),$page->getName()) ?> - <?php echo $SEP?><?php echo Button(array('action'=>_("BackLinks")), _("BackLinks"),$page->getName()) ?> + <?php echo $SEP?><?php echo Button(array('action'=>__("LikePages")), _("LikePages"), $page->getName()) ?> + <?php echo $SEP?><?php echo Button(array('action'=>__("BackLinks")), _("BackLinks"), $page->getName()) ?> <?php } ?> <?php if (!empty($user) && $user->isAdmin()) { ?> - <?php echo $SEP?><?php echo WikiLink(_("PhpWikiAdministration"), "","Admin") ?> + <?php echo $SEP?><?php echo WikiLink(__("PhpWikiAdministration"), "", _("Admin")) ?> <?php } ?> <?php if (!empty($user) && $user->isSignedIn()) { ?> - <?php echo $SEP?><?php echo WikiLink(_("UserPreferences"), "","Preferences") ?> + <?php echo $SEP?><?php echo WikiLink(__("UserPreferences"), "", _("Preferences")) ?> <?php } ?> </div> </form> Modified: trunk/themes/wikilens/templates/navbar.tmpl =================================================================== --- trunk/themes/wikilens/templates/navbar.tmpl 2021-01-04 17:19:33 UTC (rev 10225) +++ trunk/themes/wikilens/templates/navbar.tmpl 2021-01-05 09:56:40 UTC (rev 10226) @@ -10,17 +10,17 @@ <?php echo $NSEP?><?php echo WikiLink(new WikiPagename('Talk:'.$page->getName(), $page->getName()), 'button', _("Discussion")) ?> <?php } else { ?> - <?php echo $NSEP?><?php echo Button(array(),_("Article"),$page->getName()) ?> + <?php echo $NSEP?><?php echo Button(array(), _("Article"), $page->getName()) ?> <?php } ?> <?php echo $NSEP?> <?php } ?> -<?php echo WikiLink(_("RecentChanges"), "button") ?> +<?php echo WikiLink(__("RecentChanges"), "button") ?> <?php echo $NSEP?><?php echo Template('search', array('SEARCH_BEFORE' => HTML::button(_("FindPage")))) ?><?php if (!empty($revision)) { ?> -<?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision,_("LikePages"),_("LikePages")) -?><?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision,_("BackLinks"),_("BackLinks")) -?><?php echo $NSEP?><?php echo WikiLink(_("UserPreferences"), 'button',_("Preferences")) ?><?php +<?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision, _("LikePages"), __("LikePages")) +?><?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision, _("BackLinks"), __("BackLinks")) +?><?php echo $NSEP?><?php echo WikiLink(__("UserPreferences"), 'button', _("Preferences")) ?><?php /* Today's calendar page for the user, if the Calender subpage is defined. */ $UserCalPageTitle = $user->getId() . '/' . _("Calendar"); $dbi = $request->getDbh(); @@ -29,7 +29,7 @@ //$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle); ?><?php echo $NSEP?><?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?> <?php }} ?><?php if (!empty($user) && $user->isAdmin()) { ?> -<?php echo $NSEP?><?php echo WikiLink(_("PhpWikiAdministration"), "button", _("Admin")) ?> +<?php echo $NSEP?><?php echo WikiLink(__("PhpWikiAdministration"), "button", _("Admin")) ?> <?php } ?> <?php if (DEBUG & 2) { if (isset($links)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-01-07 11:13:19
|
Revision: 10230 http://sourceforge.net/p/phpwiki/code/10230 Author: vargenau Date: 2021-01-07 11:13:17 +0000 (Thu, 07 Jan 2021) Log Message: ----------- Remove "float: right" so that "position=full" works in CreateToc plugin Modified Paths: -------------- trunk/themes/MonoBook/monobook.css trunk/themes/Sidebar/sidebar.css Modified: trunk/themes/MonoBook/monobook.css =================================================================== --- trunk/themes/MonoBook/monobook.css 2021-01-06 18:34:30 UTC (rev 10229) +++ trunk/themes/MonoBook/monobook.css 2021-01-07 11:13:17 UTC (rev 10230) @@ -389,8 +389,6 @@ background-color: #f9f9f9; padding: 5px; font-size: 95%; - float: right; - clear: right; } #toc #toctitle, Modified: trunk/themes/Sidebar/sidebar.css =================================================================== --- trunk/themes/Sidebar/sidebar.css 2021-01-06 18:34:30 UTC (rev 10229) +++ trunk/themes/Sidebar/sidebar.css 2021-01-07 11:13:17 UTC (rev 10230) @@ -431,8 +431,6 @@ background-color: #f9f9f9; padding: 5px; font-size: 95%; - float: right; - clear: right; } #toc h2, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-28 14:15:47
|
Revision: 10378 http://sourceforge.net/p/phpwiki/code/10378 Author: vargenau Date: 2021-07-28 14:15:41 +0000 (Wed, 28 Jul 2021) Log Message: ----------- function format_revision: same prototype as base class Modified Paths: -------------- trunk/themes/MacOSX/lib/RecentChanges.php trunk/themes/Portland/lib/RecentChanges.php trunk/themes/SpaceWiki/lib/RecentChanges.php trunk/themes/Wordpress/lib/RecentChanges.php Modified: trunk/themes/MacOSX/lib/RecentChanges.php =================================================================== --- trunk/themes/MacOSX/lib/RecentChanges.php 2021-07-28 13:48:57 UTC (rev 10377) +++ trunk/themes/MacOSX/lib/RecentChanges.php 2021-07-28 14:15:41 UTC (rev 10378) @@ -62,7 +62,7 @@ class _MacOSX_RecentChanges_Formatter extends _RecentChanges_HtmlFormatter { - function format_revision(&$rev) + function format_revision($rev) { return MacOSX_RC_revision_formatter($this, $rev); } @@ -71,7 +71,7 @@ class _MacOSX_PageHistory_Formatter extends _PageHistory_HtmlFormatter { - function format_revision(&$rev) + function format_revision($rev) { return MacOSX_PH_revision_formatter($this, $rev); } Modified: trunk/themes/Portland/lib/RecentChanges.php =================================================================== --- trunk/themes/Portland/lib/RecentChanges.php 2021-07-28 13:48:57 UTC (rev 10377) +++ trunk/themes/Portland/lib/RecentChanges.php 2021-07-28 14:15:41 UTC (rev 10378) @@ -54,7 +54,7 @@ class _Portland_RecentChanges_Formatter extends _RecentChanges_HtmlFormatter { - function format_revision(&$rev) + function format_revision($rev) { return Portland_RC_revision_formatter($this, $rev); } @@ -73,7 +73,7 @@ class _Portland_PageHistory_Formatter extends _PageHistory_HtmlFormatter { - function format_revision(&$rev) + function format_revision($rev) { return Portland_RC_revision_formatter($this, $rev); } Modified: trunk/themes/SpaceWiki/lib/RecentChanges.php =================================================================== --- trunk/themes/SpaceWiki/lib/RecentChanges.php 2021-07-28 13:48:57 UTC (rev 10377) +++ trunk/themes/SpaceWiki/lib/RecentChanges.php 2021-07-28 14:15:41 UTC (rev 10378) @@ -62,7 +62,7 @@ class _SpaceWiki_RecentChanges_Formatter extends _RecentChanges_HtmlFormatter { - function format_revision(&$rev) + function format_revision($rev) { return SpaceWiki_RC_revision_formatter($this, $rev); } @@ -88,7 +88,7 @@ class _SpaceWiki_PageHistory_Formatter extends _PageHistory_HtmlFormatter { - function format_revision(&$rev) + function format_revision($rev) { return SpaceWiki_PH_revision_formatter($this, $rev); } Modified: trunk/themes/Wordpress/lib/RecentChanges.php =================================================================== --- trunk/themes/Wordpress/lib/RecentChanges.php 2021-07-28 13:48:57 UTC (rev 10377) +++ trunk/themes/Wordpress/lib/RecentChanges.php 2021-07-28 14:15:41 UTC (rev 10378) @@ -54,7 +54,7 @@ class _Wordpress_RecentChanges_Formatter extends _RecentChanges_HtmlFormatter { - function format_revision(&$rev) + function format_revision($rev) { return Wordpress_RC_revision_formatter($this, $rev); } @@ -73,7 +73,7 @@ class _Wordpress_PageHistory_Formatter extends _PageHistory_HtmlFormatter { - function format_revision(&$rev) + function format_revision($rev) { return Wordpress_RC_revision_formatter($this, $rev); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-28 14:29:23
|
Revision: 10380 http://sourceforge.net/p/phpwiki/code/10380 Author: vargenau Date: 2021-07-28 14:29:15 +0000 (Wed, 28 Jul 2021) Log Message: ----------- function makeActionButton: same prototype as base class Modified Paths: -------------- trunk/themes/MonoBook/themeinfo.php trunk/themes/shamino_com/themeinfo.php trunk/themes/smaller/themeinfo.php Modified: trunk/themes/MonoBook/themeinfo.php =================================================================== --- trunk/themes/MonoBook/themeinfo.php 2021-07-28 14:20:23 UTC (rev 10379) +++ trunk/themes/MonoBook/themeinfo.php 2021-07-28 14:29:15 UTC (rev 10380) @@ -41,7 +41,8 @@ class WikiTheme_MonoBook extends WikiTheme_Wikilens { /* this adds selected to the class */ - function makeActionButton($action, $label = false, $page_or_rev = false, $options = false) + function makeActionButton($action, $label = '', + $page_or_rev = false, $options = array()) { extract($this->_get_name_and_rev($page_or_rev)); Modified: trunk/themes/shamino_com/themeinfo.php =================================================================== --- trunk/themes/shamino_com/themeinfo.php 2021-07-28 14:20:23 UTC (rev 10379) +++ trunk/themes/shamino_com/themeinfo.php 2021-07-28 14:29:15 UTC (rev 10380) @@ -45,7 +45,8 @@ class WikiTheme_shamino_com extends WikiTheme { - function makeActionButton($action, $label = false, $page_or_rev = false) + function makeActionButton($action, $label = '', + $page_or_rev = false, $options = array()) { extract($this->_get_name_and_rev($page_or_rev)); Modified: trunk/themes/smaller/themeinfo.php =================================================================== --- trunk/themes/smaller/themeinfo.php 2021-07-28 14:20:23 UTC (rev 10379) +++ trunk/themes/smaller/themeinfo.php 2021-07-28 14:29:15 UTC (rev 10380) @@ -40,8 +40,8 @@ class WikiTheme_smaller extends WikiTheme { - - function makeActionButton($action, $label = false, $page_or_rev = false) + function makeActionButton($action, $label = '', + $page_or_rev = false, $options = array()) { extract($this->_get_name_and_rev($page_or_rev)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-07-30 16:28:37
|
Revision: 10410 http://sourceforge.net/p/phpwiki/code/10410 Author: vargenau Date: 2021-07-30 16:28:34 +0000 (Fri, 30 Jul 2021) Log Message: ----------- templates/ratings.tmpl: $dbi is null in PHP 8 Modified Paths: -------------- trunk/themes/Sidebar/templates/ratings.tmpl trunk/themes/fusionforge/templates/ratings.tmpl trunk/themes/wikilens/templates/ratings.tmpl Modified: trunk/themes/Sidebar/templates/ratings.tmpl =================================================================== --- trunk/themes/Sidebar/templates/ratings.tmpl 2021-07-30 16:24:07 UTC (rev 10409) +++ trunk/themes/Sidebar/templates/ratings.tmpl 2021-07-30 16:28:34 UTC (rev 10410) @@ -1,5 +1,6 @@ <?php // Ratings ?> <?php if (!$WikiTheme->DUMP_MODE) { $loader = new WikiPluginLoader(); + $dbi = $request->getDbh(); // Needed in PHP 8 printXML($loader->expandPI("<"."?plugin RateIt show=top ?".">", $request, $dbi->_markup)); } ?> Modified: trunk/themes/fusionforge/templates/ratings.tmpl =================================================================== --- trunk/themes/fusionforge/templates/ratings.tmpl 2021-07-30 16:24:07 UTC (rev 10409) +++ trunk/themes/fusionforge/templates/ratings.tmpl 2021-07-30 16:28:34 UTC (rev 10410) @@ -1,4 +1,5 @@ <?php if (!$WikiTheme->DUMP_MODE) { $loader = new WikiPluginLoader(); + $dbi = $request->getDbh(); // Needed in PHP 8 printXML($loader->expandPI("<"."?plugin RateIt show=top imgPrefix=BStar ?".">", $request, $dbi->_markup)); } ?> Modified: trunk/themes/wikilens/templates/ratings.tmpl =================================================================== --- trunk/themes/wikilens/templates/ratings.tmpl 2021-07-30 16:24:07 UTC (rev 10409) +++ trunk/themes/wikilens/templates/ratings.tmpl 2021-07-30 16:28:34 UTC (rev 10410) @@ -1,5 +1,6 @@ <?php // Ratings ?> <?php if (!$WikiTheme->DUMP_MODE) { $loader = new WikiPluginLoader(); + $dbi = $request->getDbh(); // Needed in PHP 8 printXML($loader->expandPI("<"."?plugin RateIt show=top imgPrefix=BStar ?".">", $request, $dbi->_markup)); } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-08-09 13:23:55
|
Revision: 10461 http://sourceforge.net/p/phpwiki/code/10461 Author: vargenau Date: 2021-08-09 13:23:52 +0000 (Mon, 09 Aug 2021) Log Message: ----------- CSS: factor Alert dialog code in themes/default/phpwiki-common.css Modified Paths: -------------- trunk/themes/MacOSX/MacOSX.css trunk/themes/Wordpress/Wordpress.css trunk/themes/default/phpwiki-common.css trunk/themes/default/phpwiki.css trunk/themes/fusionforge/fusionforge.css Modified: trunk/themes/MacOSX/MacOSX.css =================================================================== --- trunk/themes/MacOSX/MacOSX.css 2021-08-09 13:07:52 UTC (rev 10460) +++ trunk/themes/MacOSX/MacOSX.css 2021-08-09 13:23:52 UTC (rev 10461) @@ -778,34 +778,6 @@ padding-left: 3em; } -.dialog { - background-color: #cdf; - color: black; - margin: 2em auto 2em auto; - border: thin black solid; - width: 50%; -} - -.dialog h1, .dialog p, .dialog div { - text-align: center; -} - -.dialog h1 { - font-size: large; - margin: 0.5em 0 1em 0; -} - -.dialog div.message { - background-color: white; - color: black; - margin: 0 1em; - padding: 0.5em 0.5em; -} - -.dialog p.buttons { - margin: 1em 0 0.5em 0; -} - /* postnuke css:*/ .gensmall { font-size: 10px Modified: trunk/themes/Wordpress/Wordpress.css =================================================================== --- trunk/themes/Wordpress/Wordpress.css 2021-08-09 13:07:52 UTC (rev 10460) +++ trunk/themes/Wordpress/Wordpress.css 2021-08-09 13:23:52 UTC (rev 10461) @@ -731,34 +731,6 @@ padding-left: 3em; } -.dialog { - background-color: #cdf; - color: black; - margin: 2em auto 2em auto; - border: thin black solid; - width: 50%; -} - -.dialog h1, .dialog p, .dialog div { - text-align: center; -} - -.dialog h1 { - font-size: large; - margin: 0.5em 0 1em 0; -} - -.dialog div.message { - background-color: white; - color: black; - margin: 0 1em; - padding: 0.5em 0.5em; -} - -.dialog p.buttons { - margin: 1em 0 0.5em 0; -} - /* postnuke css:*/ .gensmall { font-size: 10px Modified: trunk/themes/default/phpwiki-common.css =================================================================== --- trunk/themes/default/phpwiki-common.css 2021-08-09 13:07:52 UTC (rev 10460) +++ trunk/themes/default/phpwiki-common.css 2021-08-09 13:23:52 UTC (rev 10461) @@ -60,6 +60,36 @@ clear: both; } +/* Alert class ======================================================== */ + +.dialog { + background-color: #cdf; + color: black; + margin: 2em auto 2em auto; + border: thin black solid; + width: 50%; +} + +.dialog h1, .dialog p, .dialog div { + text-align: center; +} + +.dialog h1 { + font-size: large; + margin: 0.5em 0 1em 0; +} + +.dialog div.message { + background-color: white; + color: black; + margin: 0 1em; + padding: 0.5em 0.5em; +} + +.dialog p.buttons { + margin: 1em 0 0.5em 0; +} + /* Transclude plugin ================================================== */ .transclude { Modified: trunk/themes/default/phpwiki.css =================================================================== --- trunk/themes/default/phpwiki.css 2021-08-09 13:07:52 UTC (rev 10460) +++ trunk/themes/default/phpwiki.css 2021-08-09 13:23:52 UTC (rev 10461) @@ -775,34 +775,6 @@ padding-left: 3em; } -.dialog { - background-color: #cdf; - color: black; - margin: 2em auto 2em auto; - border: thin black solid; - width: 50%; -} - -.dialog h1, .dialog p, .dialog div { - text-align: center; -} - -.dialog h1 { - font-size: large; - margin: 0.5em 0 1em 0; -} - -.dialog div.message { - background-color: white; - color: black; - margin: 0 1em; - padding: 0.5em 0.5em; -} - -.dialog p.buttons { - margin: 1em 0 0.5em 0; -} - /* postnuke css:*/ .gensmall { font-size: 10px Modified: trunk/themes/fusionforge/fusionforge.css =================================================================== --- trunk/themes/fusionforge/fusionforge.css 2021-08-09 13:07:52 UTC (rev 10460) +++ trunk/themes/fusionforge/fusionforge.css 2021-08-09 13:23:52 UTC (rev 10461) @@ -983,34 +983,6 @@ padding-left: 3em; } -.dialog { - background-color: #cdf; - color: black; - margin: 2em auto 2em auto; - border: thin black solid; - width: 50%; -} - -.dialog h1, .dialog p, .dialog div { - text-align: center; -} - -.dialog h1 { - font-size: large; - margin: 0.5em 0 1em 0; -} - -.dialog div.message { - background-color: white; - color: black; - margin: 0 1em; - padding: 0.5em 0.5em; -} - -.dialog p.buttons { - margin: 1em 0 0.5em 0; -} - /* postnuke css:*/ .gensmall { font-size: 10px This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-08-09 14:46:59
|
Revision: 10467 http://sourceforge.net/p/phpwiki/code/10467 Author: vargenau Date: 2021-08-09 14:46:56 +0000 (Mon, 09 Aug 2021) Log Message: ----------- CSS: factor span.redirectfrom from RedirectTo plugin Modified Paths: -------------- trunk/themes/MacOSX/MacOSX.css trunk/themes/MonoBook/monobook.css trunk/themes/Sidebar/sidebar.css trunk/themes/Wordpress/Wordpress.css trunk/themes/default/phpwiki-common.css trunk/themes/default/phpwiki.css trunk/themes/fusionforge/fusionforge.css Modified: trunk/themes/MacOSX/MacOSX.css =================================================================== --- trunk/themes/MacOSX/MacOSX.css 2021-08-09 14:17:22 UTC (rev 10466) +++ trunk/themes/MacOSX/MacOSX.css 2021-08-09 14:46:56 UTC (rev 10467) @@ -674,14 +674,6 @@ padding: 0.3ex 0.5em; } -/* "(Redirected from ...)" message. */ -span.redirectfrom { - font-size: small; - font-style: oblique; - font-weight: normal; - padding-left: 1em; -} - /* * "E-mail" style blockquote */ Modified: trunk/themes/MonoBook/monobook.css =================================================================== --- trunk/themes/MonoBook/monobook.css 2021-08-09 14:17:22 UTC (rev 10466) +++ trunk/themes/MonoBook/monobook.css 2021-08-09 14:46:56 UTC (rev 10467) @@ -1681,14 +1681,6 @@ padding: 0.3ex 0.5em; } -/* "(Redirected from ...)" message. */ -span.redirectfrom { - font-size: small; - font-style: oblique; - font-weight: normal; - padding-left: 1em; -} - .search-context { background-color: white; font-style: oblique; Modified: trunk/themes/Sidebar/sidebar.css =================================================================== --- trunk/themes/Sidebar/sidebar.css 2021-08-09 14:17:22 UTC (rev 10466) +++ trunk/themes/Sidebar/sidebar.css 2021-08-09 14:46:56 UTC (rev 10467) @@ -1685,14 +1685,6 @@ padding: 0.3ex 0.5em; } -/* "(Redirected from ...)" message. */ -span.redirectfrom { - font-size: small; - font-style: oblique; - font-weight: normal; - padding-left: 1em; -} - .search-context { background-color: white; font-style: oblique; Modified: trunk/themes/Wordpress/Wordpress.css =================================================================== --- trunk/themes/Wordpress/Wordpress.css 2021-08-09 14:17:22 UTC (rev 10466) +++ trunk/themes/Wordpress/Wordpress.css 2021-08-09 14:46:56 UTC (rev 10467) @@ -594,14 +594,6 @@ padding: 0.3ex 0.5em; } -/* "(Redirected from ...)" message. */ -span.redirectfrom { - font-size: small; - font-style: oblique; - font-weight: normal; - padding-left: 1em; -} - /* * "DL tables" */ Modified: trunk/themes/default/phpwiki-common.css =================================================================== --- trunk/themes/default/phpwiki-common.css 2021-08-09 14:17:22 UTC (rev 10466) +++ trunk/themes/default/phpwiki-common.css 2021-08-09 14:46:56 UTC (rev 10467) @@ -97,6 +97,16 @@ width: 100%; } +/* RedirectTo plugin ================================================== */ + +/* "(Redirected from ...)" message. */ +span.redirectfrom { + font-size: small; + font-style: oblique; + font-weight: normal; + padding-left: 1em; +} + /* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ /* Modified: trunk/themes/default/phpwiki.css =================================================================== --- trunk/themes/default/phpwiki.css 2021-08-09 14:17:22 UTC (rev 10466) +++ trunk/themes/default/phpwiki.css 2021-08-09 14:46:56 UTC (rev 10467) @@ -637,14 +637,6 @@ padding: 0.3ex 0.5em; } -/* "(Redirected from ...)" message. */ -span.redirectfrom { - font-size: small; - font-style: oblique; - font-weight: normal; - padding-left: 1em; -} - /* * "DL tables" */ Modified: trunk/themes/fusionforge/fusionforge.css =================================================================== --- trunk/themes/fusionforge/fusionforge.css 2021-08-09 14:17:22 UTC (rev 10466) +++ trunk/themes/fusionforge/fusionforge.css 2021-08-09 14:46:56 UTC (rev 10467) @@ -842,16 +842,6 @@ padding: 0.3ex 0.5em; } -/* RedirectTo plugin ================================================== */ - -/* "(Redirected from ...)" message. */ -span.redirectfrom { - font-size: small; - font-style: oblique; - font-weight: normal; - padding-left: 1em; -} - /* * "DL tables" */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-08-09 15:06:00
|
Revision: 10468 http://sourceforge.net/p/phpwiki/code/10468 Author: vargenau Date: 2021-08-09 15:05:57 +0000 (Mon, 09 Aug 2021) Log Message: ----------- Add Redirected message in Portland and Wordpress themes Modified Paths: -------------- trunk/themes/Portland/templates/browse.tmpl trunk/themes/Wordpress/templates/browse.tmpl Modified: trunk/themes/Portland/templates/browse.tmpl =================================================================== --- trunk/themes/Portland/templates/browse.tmpl 2021-08-09 14:46:56 UTC (rev 10467) +++ trunk/themes/Portland/templates/browse.tmpl 2021-08-09 15:05:57 UTC (rev 10468) @@ -9,8 +9,12 @@ <?php echo WikiLink($page, 'existing', _("View the current version."))?></p> <hr class="ignore" /> <?php } ?> +<?php if (!empty($redirected)) { ?> + <p><?php echo $redirected ?></p> +<?php } ?> <?php echo $CONTENT?> + <hr /> <?php echo Template('actionbar') ?> <?php // The bottom navigation/search bar ?> Modified: trunk/themes/Wordpress/templates/browse.tmpl =================================================================== --- trunk/themes/Wordpress/templates/browse.tmpl 2021-08-09 14:46:56 UTC (rev 10467) +++ trunk/themes/Wordpress/templates/browse.tmpl 2021-08-09 15:05:57 UTC (rev 10468) @@ -9,8 +9,12 @@ <?php echo WikiLink($page, 'existing', _("View the current version."))?>.</p> <hr class="ignore" /> <?php } ?> +<?php if (!empty($redirected)) { ?> + <p><?php echo $redirected ?></p> +<?php } ?> <?php echo $CONTENT?> + <hr /> <?php echo Template('actionbar') ?> <?php // The bottom navigation/search bar ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-08-09 15:48:14
|
Revision: 10470 http://sourceforge.net/p/phpwiki/code/10470 Author: vargenau Date: 2021-08-09 15:48:12 +0000 (Mon, 09 Aug 2021) Log Message: ----------- Use LANG language Modified Paths: -------------- trunk/themes/Crao/templates/htmldump.tmpl trunk/themes/Sidebar/templates/htmldump.tmpl trunk/themes/default/templates/htmldump.tmpl Modified: trunk/themes/Crao/templates/htmldump.tmpl =================================================================== --- trunk/themes/Crao/templates/htmldump.tmpl 2021-08-09 15:34:48 UTC (rev 10469) +++ trunk/themes/Crao/templates/htmldump.tmpl 2021-08-09 15:48:12 UTC (rev 10470) @@ -5,7 +5,7 @@ */ ?> <!DOCTYPE html> -<html xml:lang="en" lang="en"> +<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>"> <head> <meta charset="UTF-8" /> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> Modified: trunk/themes/Sidebar/templates/htmldump.tmpl =================================================================== --- trunk/themes/Sidebar/templates/htmldump.tmpl 2021-08-09 15:34:48 UTC (rev 10469) +++ trunk/themes/Sidebar/templates/htmldump.tmpl 2021-08-09 15:48:12 UTC (rev 10470) @@ -5,7 +5,7 @@ */ ?> <!DOCTYPE html> -<html xml:lang="en" lang="en" xmlns="http://www.w3.org/1999/xhtml"> +<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>"> <head> <meta charset="UTF-8" /> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> Modified: trunk/themes/default/templates/htmldump.tmpl =================================================================== --- trunk/themes/default/templates/htmldump.tmpl 2021-08-09 15:34:48 UTC (rev 10469) +++ trunk/themes/default/templates/htmldump.tmpl 2021-08-09 15:48:12 UTC (rev 10470) @@ -5,7 +5,7 @@ */ ?> <!DOCTYPE html> -<html xml:lang="en" lang="en"> +<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>"> <head> <meta charset="UTF-8" /> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-08-09 16:51:07
|
Revision: 10471 http://sourceforge.net/p/phpwiki/code/10471 Author: vargenau Date: 2021-08-09 16:51:06 +0000 (Mon, 09 Aug 2021) Log Message: ----------- Do not print selection box in RecentChanges Modified Paths: -------------- trunk/themes/default/phpwiki-printer.css trunk/themes/fusionforge/fusionforge-print.css Modified: trunk/themes/default/phpwiki-printer.css =================================================================== --- trunk/themes/default/phpwiki-printer.css 2021-08-09 15:48:12 UTC (rev 10470) +++ trunk/themes/default/phpwiki-printer.css 2021-08-09 16:51:06 UTC (rev 10471) @@ -138,8 +138,8 @@ background: white; } -/* Hide (diff) links and days buttons in RecentChanges */ -.wiki-rc-action { +/* Do not print selection box in RecentChanges */ +fieldset.wiki-rc-action { display: none; } Modified: trunk/themes/fusionforge/fusionforge-print.css =================================================================== --- trunk/themes/fusionforge/fusionforge-print.css 2021-08-09 15:48:12 UTC (rev 10470) +++ trunk/themes/fusionforge/fusionforge-print.css 2021-08-09 16:51:06 UTC (rev 10471) @@ -78,6 +78,11 @@ display: none; } +/* Do not print selection box in RecentChanges */ +fieldset.wiki-rc-action { + display: none; +} + /* Print links in black */ a { color: black; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-08-14 13:16:07
|
Revision: 10513 http://sourceforge.net/p/phpwiki/code/10513 Author: vargenau Date: 2021-08-14 13:16:04 +0000 (Sat, 14 Aug 2021) Log Message: ----------- Remove MacOSX CSS hack Modified Paths: -------------- trunk/themes/MacOSX/themeinfo.php trunk/themes/default/phpwiki-printer.css Modified: trunk/themes/MacOSX/themeinfo.php =================================================================== --- trunk/themes/MacOSX/themeinfo.php 2021-08-14 12:46:33 UTC (rev 10512) +++ trunk/themes/MacOSX/themeinfo.php 2021-08-14 13:16:04 UTC (rev 10513) @@ -57,19 +57,6 @@ class WikiTheme_MacOSX extends WikiTheme { - function getCSS() - { - // FIXME: this is a hack which will not be needed once - // we have dynamic CSS. - $css = WikiTheme::getCSS(); - $css->pushContent(HTML::style(array('type' => 'text/css'), - new RawXml(sprintf("<!--\nbody {background-image: url(%s);}\n-->\n", - $this->getImageURL('bgpaper8'))))); - //for non-browse pages, like former editpage, message etc. - //$this->getImageURL('bggranular'))); - return $css; - } - function getRecentChangesFormatter($format) { include_once($this->file('lib/RecentChanges.php')); Modified: trunk/themes/default/phpwiki-printer.css =================================================================== --- trunk/themes/default/phpwiki-printer.css 2021-08-14 12:46:33 UTC (rev 10512) +++ trunk/themes/default/phpwiki-printer.css 2021-08-14 13:16:04 UTC (rev 10513) @@ -9,16 +9,6 @@ * General */ -/** - * required for Mozilla with MacOSX theme, because of - * body {background-image: url(/finkwiki/themes/MacOSX/images/bgpaper8.png);} - * within the html itself. It still does not suppress - * the bg image of a small strip near the top and bottom. :/ - */ -html { - background: white; -} - body { margin: 1em; padding: 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-08-14 13:34:11
|
Revision: 10514 http://sourceforge.net/p/phpwiki/code/10514 Author: vargenau Date: 2021-08-14 13:34:08 +0000 (Sat, 14 Aug 2021) Log Message: ----------- Remove messsage after editing "Your careful attention to detail is much appreciated." Modified Paths: -------------- trunk/themes/default/templates/savepage.tmpl Removed Paths: ------------- trunk/themes/fusionforge/templates/savepage.tmpl Modified: trunk/themes/default/templates/savepage.tmpl =================================================================== --- trunk/themes/default/templates/savepage.tmpl 2021-08-14 13:16:04 UTC (rev 10513) +++ trunk/themes/default/templates/savepage.tmpl 2021-08-14 13:34:08 UTC (rev 10514) @@ -1,20 +1,9 @@ -<?php - $signatureURL = $WikiTheme->getImageURL('signature'); -?> -<p><?php echo fmt("Thank you for editing %s.", WikiLink($page))?> -<?php echo _("Your careful attention to detail is much appreciated.")?></p> - <?php if (!empty($WARNINGS)) { ?> <?php echo $WARNINGS ?> <?php } ?> -<?php if ($signatureURL) { ?> - <p><img src="<?php echo $signatureURL?>" id="signature" alt="signature" /></p> -<?php } ?> - <?php if (!empty($LOCK_CHANGED_MSG)) { ?> <p><?php echo $LOCK_CHANGED_MSG?></p> <?php } ?> -<hr /> <?php echo Template('browse') ?> Deleted: trunk/themes/fusionforge/templates/savepage.tmpl =================================================================== --- trunk/themes/fusionforge/templates/savepage.tmpl 2021-08-14 13:16:04 UTC (rev 10513) +++ trunk/themes/fusionforge/templates/savepage.tmpl 2021-08-14 13:34:08 UTC (rev 10514) @@ -1,9 +0,0 @@ -<?php if (!empty($WARNINGS)) { ?> - <?php echo $WARNINGS ?> -<?php } ?> - -<?php if (!empty($LOCK_CHANGED_MSG)) { ?> - <p><?php echo $LOCK_CHANGED_MSG?></p> -<?php } ?> - -<?php echo Template('browse') ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-09-03 10:18:10
|
Revision: 10534 http://sourceforge.net/p/phpwiki/code/10534 Author: vargenau Date: 2021-09-03 10:18:08 +0000 (Fri, 03 Sep 2021) Log Message: ----------- Remove references to CSS2, CSS3 is needed Modified Paths: -------------- trunk/themes/MonoBook/commonPrint.css trunk/themes/MonoBook/monobook.css trunk/themes/MonoBook/themeinfo.php trunk/themes/Sidebar/sidebar.css trunk/themes/SpaceWiki/SpaceWiki.css Modified: trunk/themes/MonoBook/commonPrint.css =================================================================== --- trunk/themes/MonoBook/commonPrint.css 2021-09-03 10:12:29 UTC (rev 10533) +++ trunk/themes/MonoBook/commonPrint.css 2021-09-03 10:18:08 UTC (rev 10534) @@ -1,5 +1,5 @@ /* -** Mediawiki Print style sheet for CSS2-capable browsers. +** Mediawiki Print style sheet ** Copyright Gabriel Wicke, http://www.aulinx.de/ ** ** Derived from the plone (http://plone.org/) styles Modified: trunk/themes/MonoBook/monobook.css =================================================================== --- trunk/themes/MonoBook/monobook.css 2021-09-03 10:12:29 UTC (rev 10533) +++ trunk/themes/MonoBook/monobook.css 2021-09-03 10:18:08 UTC (rev 10534) @@ -1,5 +1,5 @@ /* -** MediaWiki 'monobook' style sheet for CSS2-capable browsers. +** MediaWiki 'monobook' style sheet ** Copyright Gabriel Wicke - http://wikidev.net/ ** License: GPL (http://www.gnu.org/copyleft/gpl.html) ** Modified: trunk/themes/MonoBook/themeinfo.php =================================================================== --- trunk/themes/MonoBook/themeinfo.php 2021-09-03 10:12:29 UTC (rev 10533) +++ trunk/themes/MonoBook/themeinfo.php 2021-09-03 10:18:08 UTC (rev 10534) @@ -31,7 +31,7 @@ /** * The new mediawiki (Wikipedia.org) default style. - * Mediawiki 'monobook' style sheet for CSS2-capable browsers. + * Mediawiki 'monobook' style sheet * Copyright Gabriel Wicke - http://www.aulinx.de/ * See main.css for more. */ Modified: trunk/themes/Sidebar/sidebar.css =================================================================== --- trunk/themes/Sidebar/sidebar.css 2021-09-03 10:12:29 UTC (rev 10533) +++ trunk/themes/Sidebar/sidebar.css 2021-09-03 10:18:08 UTC (rev 10534) @@ -1,5 +1,5 @@ /* -** Based upon the MediaWiki 'monobook' style sheet for CSS2-capable browsers. +** Based upon the MediaWiki 'monobook' style sheet ** Copyright Gabriel Wicke - http://wikidev.net/ ** License: GPL (http://www.gnu.org/copyleft/gpl.html) ** Modified: trunk/themes/SpaceWiki/SpaceWiki.css =================================================================== --- trunk/themes/SpaceWiki/SpaceWiki.css 2021-09-03 10:12:29 UTC (rev 10533) +++ trunk/themes/SpaceWiki/SpaceWiki.css 2021-09-03 10:18:08 UTC (rev 10534) @@ -2,8 +2,6 @@ * This theme will probably be renamed something like "Space" to * avoid any potential copyright issues. * - * http://www.w3.org/TR/REC-CSS2/indexlist.html - * * #fff; white * #000; black * #fff313; yellow This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-09-05 07:01:33
|
Revision: 10540 http://sourceforge.net/p/phpwiki/code/10540 Author: vargenau Date: 2021-09-05 07:01:30 +0000 (Sun, 05 Sep 2021) Log Message: ----------- Use CSS class warning_msg for "You are viewing an old revision of this page." Modified Paths: -------------- trunk/themes/Crao/templates/browse.tmpl trunk/themes/MonoBook/templates/browse.tmpl trunk/themes/Portland/templates/browse.tmpl trunk/themes/Wordpress/templates/browse.tmpl trunk/themes/blog/templates/browse.tmpl trunk/themes/default/templates/browse.tmpl Modified: trunk/themes/Crao/templates/browse.tmpl =================================================================== --- trunk/themes/Crao/templates/browse.tmpl 2021-09-04 11:54:14 UTC (rev 10539) +++ trunk/themes/Crao/templates/browse.tmpl 2021-09-05 07:01:30 UTC (rev 10540) @@ -2,8 +2,8 @@ $action = $request->getArg('action'); ?> <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p><strong><?php echo _("Note:")?></strong> - <?php echo _("You are viewing an old revision of this page.")?> + <p class="warning_msg"><?php echo _("Note:")?> + <?php echo _("You are viewing an old revision of this page.")?> <?php echo Button('browse', _("View the current version."), $page)?> </p> <?php } ?> Modified: trunk/themes/MonoBook/templates/browse.tmpl =================================================================== --- trunk/themes/MonoBook/templates/browse.tmpl 2021-09-04 11:54:14 UTC (rev 10539) +++ trunk/themes/MonoBook/templates/browse.tmpl 2021-09-05 07:01:30 UTC (rev 10540) @@ -2,8 +2,8 @@ $action = $request->getArg('action'); ?> <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p><strong><?php echo _("Note:")?></strong> - <?php echo _("You are viewing an old revision of this page.")?> + <p class="warning_msg"><?php echo _("Note:")?> + <?php echo _("You are viewing an old revision of this page.")?> <?php echo Button('browse', _("View the current version."), $page)?> </p> <?php } ?> Modified: trunk/themes/Portland/templates/browse.tmpl =================================================================== --- trunk/themes/Portland/templates/browse.tmpl 2021-09-04 11:54:14 UTC (rev 10539) +++ trunk/themes/Portland/templates/browse.tmpl 2021-09-05 07:01:30 UTC (rev 10540) @@ -4,9 +4,10 @@ <br class="clear-floats" /> <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p><strong><?php echo _("Note:")?></strong> - <?php echo _("You are viewing an old revision of this page.")?> - <?php echo WikiLink($page, 'existing', _("View the current version."))?></p> + <p class="warning_msg"><?php echo _("Note:")?> + <?php echo _("You are viewing an old revision of this page.")?> + <?php echo WikiLink($page, 'existing', _("View the current version."))?> + </p> <hr class="ignore" /> <?php } ?> <?php if (!empty($redirected)) { ?> Modified: trunk/themes/Wordpress/templates/browse.tmpl =================================================================== --- trunk/themes/Wordpress/templates/browse.tmpl 2021-09-04 11:54:14 UTC (rev 10539) +++ trunk/themes/Wordpress/templates/browse.tmpl 2021-09-05 07:01:30 UTC (rev 10540) @@ -4,9 +4,10 @@ <br class="clear-floats" /> <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p><strong><?php echo _("Note:")?></strong> - <?php echo _("You are viewing an old revision of this page.")?> - <?php echo WikiLink($page, 'existing', _("View the current version."))?>.</p> + <p class="warning_msg"><?php echo _("Note:")?> + <?php echo _("You are viewing an old revision of this page.")?> + <?php echo WikiLink($page, 'existing', _("View the current version."))?>. + </p> <hr class="ignore" /> <?php } ?> <?php if (!empty($redirected)) { ?> Modified: trunk/themes/blog/templates/browse.tmpl =================================================================== --- trunk/themes/blog/templates/browse.tmpl 2021-09-04 11:54:14 UTC (rev 10539) +++ trunk/themes/blog/templates/browse.tmpl 2021-09-05 07:01:30 UTC (rev 10540) @@ -2,8 +2,8 @@ $action = $request->getArg('action'); ?> <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p><strong><?php echo _("Note:")?></strong> - <?php echo _("You are viewing an old revision of this page.")?> + <p class="warning_msg"><?php echo _("Note:")?> + <?php echo _("You are viewing an old revision of this page.")?> <?php echo Button('browse', _("View the current version."), $page)?> </p> <?php } ?> Modified: trunk/themes/default/templates/browse.tmpl =================================================================== --- trunk/themes/default/templates/browse.tmpl 2021-09-04 11:54:14 UTC (rev 10539) +++ trunk/themes/default/templates/browse.tmpl 2021-09-05 07:01:30 UTC (rev 10540) @@ -2,8 +2,8 @@ $action = $request->getArg('action'); ?> <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p><strong><?php echo _("Note:")?></strong> - <?php echo _("You are viewing an old revision of this page.")?> + <p class="warning_msg"><?php echo _("Note:")?> + <?php echo _("You are viewing an old revision of this page.")?> <?php echo Button('browse', _("View the current version."), $page)?> </p> <?php } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-12-06 09:26:31
|
Revision: 10725 http://sourceforge.net/p/phpwiki/code/10725 Author: vargenau Date: 2021-12-06 09:26:30 +0000 (Mon, 06 Dec 2021) Log Message: ----------- Remove old previews Removed Paths: ------------- trunk/themes/MonoBook/preview.png trunk/themes/SpaceWiki/preview.png trunk/themes/blog/preview.png Deleted: trunk/themes/MonoBook/preview.png =================================================================== (Binary files differ) Deleted: trunk/themes/SpaceWiki/preview.png =================================================================== (Binary files differ) Deleted: trunk/themes/blog/preview.png =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-12-15 14:00:57
|
Revision: 10784 http://sourceforge.net/p/phpwiki/code/10784 Author: vargenau Date: 2021-12-15 14:00:55 +0000 (Wed, 15 Dec 2021) Log Message: ----------- Set $LANG in templates Modified Paths: -------------- trunk/themes/Crao/templates/htmldump.tmpl trunk/themes/Sidebar/templates/htmldump.tmpl trunk/themes/default/templates/dialog.tmpl trunk/themes/default/templates/html.tmpl trunk/themes/default/templates/htmldump.tmpl trunk/themes/default/templates/redirect.tmpl Modified: trunk/themes/Crao/templates/htmldump.tmpl =================================================================== --- trunk/themes/Crao/templates/htmldump.tmpl 2021-12-15 12:06:39 UTC (rev 10783) +++ trunk/themes/Crao/templates/htmldump.tmpl 2021-12-15 14:00:55 UTC (rev 10784) @@ -1,11 +1,20 @@ <?php /* * This template is used only for html file dumps, and is responsible - * mainly for the outer level <html> stuff and the and <head>. + * mainly for the outer level <html> stuff and the <head>. */ +global $LANG; +if (empty($LANG)) { + $pref = &$request->_prefs; + if ($pref) { + $LANG = $pref->get('lang'); + } else { + $LANG = DEFAULT_LANGUAGE; + } +} ?> <!DOCTYPE html> -<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>"> +<html xml:lang="<?php echo $LANG ?>" lang="<?php echo $LANG ?>"> <head> <meta charset="UTF-8" /> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> Modified: trunk/themes/Sidebar/templates/htmldump.tmpl =================================================================== --- trunk/themes/Sidebar/templates/htmldump.tmpl 2021-12-15 12:06:39 UTC (rev 10783) +++ trunk/themes/Sidebar/templates/htmldump.tmpl 2021-12-15 14:00:55 UTC (rev 10784) @@ -1,11 +1,20 @@ <?php /* * This template is used only for html file dumps, and is responsible - * mainly for the outer level <html> stuff and the and <head>. + * mainly for the outer level <html> stuff and the <head>. */ +global $LANG; +if (empty($LANG)) { + $pref = &$request->_prefs; + if ($pref) { + $LANG = $pref->get('lang'); + } else { + $LANG = DEFAULT_LANGUAGE; + } +} ?> <!DOCTYPE html> -<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>"> +<html xml:lang="<?php echo $LANG ?>" lang="<?php echo $LANG ?>"> <head> <meta charset="UTF-8" /> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> Modified: trunk/themes/default/templates/dialog.tmpl =================================================================== --- trunk/themes/default/templates/dialog.tmpl 2021-12-15 12:06:39 UTC (rev 10783) +++ trunk/themes/default/templates/dialog.tmpl 2021-12-15 14:00:55 UTC (rev 10784) @@ -2,9 +2,18 @@ /* * A "popup" dialog. (Though it does not pop up yet.) */ +global $LANG; +if (empty($LANG)) { + $pref = &$request->_prefs; + if ($pref) { + $LANG = $pref->get('lang'); + } else { + $LANG = DEFAULT_LANGUAGE; + } +} ?> <!DOCTYPE html> -<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>"> +<html xml:lang="<?php echo $LANG ?>" lang="<?php echo $LANG ?>"> <head> <meta charset="UTF-8" /> <meta name="robots" content="noindex, nofollow" /> Modified: trunk/themes/default/templates/html.tmpl =================================================================== --- trunk/themes/default/templates/html.tmpl 2021-12-15 12:06:39 UTC (rev 10783) +++ trunk/themes/default/templates/html.tmpl 2021-12-15 14:00:55 UTC (rev 10784) @@ -2,9 +2,18 @@ /* * This template is responsible mainly for the outer level <html> stuff. */ +global $LANG; +if (empty($LANG)) { + $pref = &$request->_prefs; + if ($pref) { + $LANG = $pref->get('lang'); + } else { + $LANG = DEFAULT_LANGUAGE; + } +} ?> <!DOCTYPE html> -<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>"> +<html xml:lang="<?php echo $LANG ?>" lang="<?php echo $LANG ?>"> <?php echo Template('head') ?> <?php echo Template('body') ?> </html> Modified: trunk/themes/default/templates/htmldump.tmpl =================================================================== --- trunk/themes/default/templates/htmldump.tmpl 2021-12-15 12:06:39 UTC (rev 10783) +++ trunk/themes/default/templates/htmldump.tmpl 2021-12-15 14:00:55 UTC (rev 10784) @@ -1,11 +1,20 @@ <?php /* * This template is used only for html file dumps, and is responsible - * mainly for the outer level <html> stuff and the and <head>. + * mainly for the outer level <html> stuff and the <head>. */ +global $LANG; +if (empty($LANG)) { + $pref = &$request->_prefs; + if ($pref) { + $LANG = $pref->get('lang'); + } else { + $LANG = DEFAULT_LANGUAGE; + } +} ?> <!DOCTYPE html> -<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>"> +<html xml:lang="<?php echo $LANG ?>" lang="<?php echo $LANG ?>"> <head> <meta charset="UTF-8" /> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> Modified: trunk/themes/default/templates/redirect.tmpl =================================================================== --- trunk/themes/default/templates/redirect.tmpl 2021-12-15 12:06:39 UTC (rev 10783) +++ trunk/themes/default/templates/redirect.tmpl 2021-12-15 14:00:55 UTC (rev 10784) @@ -2,9 +2,18 @@ /* * Redirect output. */ +global $LANG; +if (empty($LANG)) { + $pref = &$request->_prefs; + if ($pref) { + $LANG = $pref->get('lang'); + } else { + $LANG = DEFAULT_LANGUAGE; + } +} ?> <!DOCTYPE html> -<html xml:lang="<?php echo $GLOBALS['LANG']?>" lang="<?php echo $GLOBALS['LANG']?>"> +<html xml:lang="<?php echo $LANG ?>" lang="<?php echo $LANG ?>"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta name="robots" content="noindex, nofollow" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-12-16 15:48:00
|
Revision: 10792 http://sourceforge.net/p/phpwiki/code/10792 Author: vargenau Date: 2021-12-16 15:47:59 +0000 (Thu, 16 Dec 2021) Log Message: ----------- themes/Sidebar/templates/ratings.tmpl and themes/wikilens/templates/ratings.tmpl: remove comment Modified Paths: -------------- trunk/themes/Sidebar/templates/ratings.tmpl trunk/themes/wikilens/templates/ratings.tmpl Modified: trunk/themes/Sidebar/templates/ratings.tmpl =================================================================== --- trunk/themes/Sidebar/templates/ratings.tmpl 2021-12-16 15:45:20 UTC (rev 10791) +++ trunk/themes/Sidebar/templates/ratings.tmpl 2021-12-16 15:47:59 UTC (rev 10792) @@ -1,4 +1,3 @@ -<?php // Ratings ?> <?php if (!$WikiTheme->DUMP_MODE) { $loader = new WikiPluginLoader(); $dbi = $request->getDbh(); // Needed in PHP 8 Modified: trunk/themes/wikilens/templates/ratings.tmpl =================================================================== --- trunk/themes/wikilens/templates/ratings.tmpl 2021-12-16 15:45:20 UTC (rev 10791) +++ trunk/themes/wikilens/templates/ratings.tmpl 2021-12-16 15:47:59 UTC (rev 10792) @@ -1,4 +1,3 @@ -<?php // Ratings ?> <?php if (!$WikiTheme->DUMP_MODE) { $loader = new WikiPluginLoader(); $dbi = $request->getDbh(); // Needed in PHP 8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-12-16 16:21:45
|
Revision: 10797 http://sourceforge.net/p/phpwiki/code/10797 Author: vargenau Date: 2021-12-16 16:21:43 +0000 (Thu, 16 Dec 2021) Log Message: ----------- templates/viewsource.tmpl: reformat Modified Paths: -------------- trunk/themes/MonoBook/templates/viewsource.tmpl trunk/themes/Portland/templates/viewsource.tmpl trunk/themes/Wordpress/templates/viewsource.tmpl trunk/themes/default/templates/viewsource.tmpl Modified: trunk/themes/MonoBook/templates/viewsource.tmpl =================================================================== --- trunk/themes/MonoBook/templates/viewsource.tmpl 2021-12-16 16:20:13 UTC (rev 10796) +++ trunk/themes/MonoBook/templates/viewsource.tmpl 2021-12-16 16:21:43 UTC (rev 10797) @@ -1,4 +1,5 @@ -<?php if ($page->get('locked') && !$user->isAdmin()) { ?> +<?php +if ($page->get('locked') && !$user->isAdmin()) { ?> <p class="warning_msg"><strong><?php echo _("Note:")?></strong> <?php echo _("This page has been locked and cannot be edited.")?> </p> @@ -14,4 +15,5 @@ rows="<?php echo $request->getPref('editHeight')?>" cols="<?php echo $request->getPref('editWidth')?>" readonly="readonly" -><?php echo $PAGE_SOURCE ?></textarea> +><?php echo $PAGE_SOURCE ?> +</textarea> Modified: trunk/themes/Portland/templates/viewsource.tmpl =================================================================== --- trunk/themes/Portland/templates/viewsource.tmpl 2021-12-16 16:20:13 UTC (rev 10796) +++ trunk/themes/Portland/templates/viewsource.tmpl 2021-12-16 16:21:43 UTC (rev 10797) @@ -1,4 +1,5 @@ -<?php if ($page->get('locked') && !$user->isAdmin()) { ?> +<?php +if ($page->get('locked') && !$user->isAdmin()) { ?> <p class="warning_msg"><strong><?php echo _("Note:")?></strong> <?php echo _("This page has been locked and cannot be edited.")?> </p> @@ -13,7 +14,8 @@ rows="<?php echo $request->getPref('editHeight')?>" cols="<?php echo $request->getPref('editWidth')?>" readonly="readonly" -><?php echo $PAGE_SOURCE ?></textarea> +><?php echo $PAGE_SOURCE ?> +</textarea> <hr /> <a href="<?php echo WikiURL($page,array('action'=>_("PageHistory")))?>"> <?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a> Modified: trunk/themes/Wordpress/templates/viewsource.tmpl =================================================================== --- trunk/themes/Wordpress/templates/viewsource.tmpl 2021-12-16 16:20:13 UTC (rev 10796) +++ trunk/themes/Wordpress/templates/viewsource.tmpl 2021-12-16 16:21:43 UTC (rev 10797) @@ -1,5 +1,4 @@ <div class="wikitext"> - <?php if (empty($revision)) $revision = $page->getCurrentRevision(false); if ($page->get('locked') && !$user->isAdmin()) { ?> @@ -17,10 +16,10 @@ rows="<?php echo $request->getPref('editHeight')?>" cols="<?php echo $request->getPref('editWidth')?>" readonly="readonly" -><?php echo $PAGE_SOURCE ?></textarea> +><?php echo $PAGE_SOURCE ?> +</textarea> <hr /> <a href="<?php echo WikiURL($page,array('action'=>_("PageHistory")))?>"> <?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a> <br /> - </div> Modified: trunk/themes/default/templates/viewsource.tmpl =================================================================== --- trunk/themes/default/templates/viewsource.tmpl 2021-12-16 16:20:13 UTC (rev 10796) +++ trunk/themes/default/templates/viewsource.tmpl 2021-12-16 16:21:43 UTC (rev 10797) @@ -1,4 +1,5 @@ -<?php if ($page->get('locked') && !$user->isAdmin()) { ?> +<?php +if ($page->get('locked') && !$user->isAdmin()) { ?> <p class="warning_msg"><strong><?php echo _("Note:")?></strong> <?php echo _("This page has been locked and cannot be edited.")?> </p> @@ -14,8 +15,8 @@ rows="<?php echo $request->getPref('editHeight')?>" cols="<?php echo $request->getPref('editWidth')?>" readonly="readonly" -><?php echo $PAGE_SOURCE ?></textarea> - +><?php echo $PAGE_SOURCE ?> +</textarea> <div id="footer"><?php // for top & bottom toolbars stylesheet ?> <?php echo Template('browse-footer')?> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-12-16 16:45:19
|
Revision: 10798 http://sourceforge.net/p/phpwiki/code/10798 Author: vargenau Date: 2021-12-16 16:45:16 +0000 (Thu, 16 Dec 2021) Log Message: ----------- templates/signin.tmpl: formatting Modified Paths: -------------- trunk/themes/Crao/templates/signin.tmpl trunk/themes/MonoBook/templates/signin.tmpl trunk/themes/Sidebar/templates/signin.tmpl trunk/themes/Wordpress/templates/signin.tmpl trunk/themes/default/templates/signin.tmpl trunk/themes/shamino_com/templates/signin.tmpl trunk/themes/smaller/templates/signin.tmpl Modified: trunk/themes/Crao/templates/signin.tmpl =================================================================== --- trunk/themes/Crao/templates/signin.tmpl 2021-12-16 16:21:43 UTC (rev 10797) +++ trunk/themes/Crao/templates/signin.tmpl 2021-12-16 16:45:16 UTC (rev 10798) @@ -7,9 +7,9 @@ <?php if (empty($NOFORM)) { ?> <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>"> <?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?> -<?php } ?> -<?php if ($user->isSignedIn()) { - $SignOutB = $WikiTheme->makeButton(_("Sign Out"), "javascript:SignOut();", 'wikiaction'); +<?php } +if ($user->isSignedIn()) { + $SignOutB = $WikiTheme->makeButton(_("Sign Out"), "javascript:SignOut();", 'wikiaction'); ?> <span> <?php echo fmt("You are signed in as %s", WikiLink($user->getId(), 'auto')) ?> @@ -33,7 +33,7 @@ 'size' => 12, 'maxlength' => 256, 'onchange' => "SignIn(this.form);")); - $SignInInput->addTooltip(_("Enter your UserId to sign in")) + $SignInInput->addTooltip(_("Enter your UserId to sign in")); ?> <script type="text/javascript"> <!-- function SignIn(form) { Modified: trunk/themes/MonoBook/templates/signin.tmpl =================================================================== --- trunk/themes/MonoBook/templates/signin.tmpl 2021-12-16 16:21:43 UTC (rev 10797) +++ trunk/themes/MonoBook/templates/signin.tmpl 2021-12-16 16:45:16 UTC (rev 10798) @@ -1,20 +1,20 @@ -<?php // On MonoBook we do away with only GET urls, no form. +<?php $sp = HTML::raw(" "); $id = $user->UserName(); ?> <div class="portlet" id="p-personal"><div class="pBody"> - <ul> - <?php if ($user->isAuthenticated()) { ?> +<ul> +<?php if ($user->isAuthenticated()) { ?> <li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li> <li><?php echo WikiLink($id . "/Discussion", 'auto' , _("My Discussion")) ?></li> <li><?php echo WikiLink(__("UserPreferences"), "", _("My Preferences")) ?></li> <li><?php echo WikiLink(__("MyRecentChanges"), "", _("My Changes")) ?></li> <li><?php echo HTML::a(array('href'=>'?'.urlencode('auth[logout]').'=1'),$sp,_("Logout"),$sp) ?></li> - <?php } else { ?> - <?php // Login or Register ?> - <?php if ($id) { ?> + <?php } else { +if ($id) { ?> <li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li> <?php } ?> <li id="pt-login"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[login]').'=1'),$sp,_("Sign In"),$sp) ?></li> - <?php } ?> - </ul> -</div></div> +<?php } ?> +</ul> +</div> +</div> Modified: trunk/themes/Sidebar/templates/signin.tmpl =================================================================== --- trunk/themes/Sidebar/templates/signin.tmpl 2021-12-16 16:21:43 UTC (rev 10797) +++ trunk/themes/Sidebar/templates/signin.tmpl 2021-12-16 16:45:16 UTC (rev 10798) @@ -1,22 +1,22 @@ <header role="banner"> -<div class="portlet" id="p-personal"><div class="pBody"><ul> +<div class="portlet" id="p-personal"><div class="pBody"> +<ul> <?php if ($user->isAuthenticated()) { - $sp = HTML::raw(" "); $id = $user->getAuthenticatedId(); ?> - <li id="pt-mypages"><?php echo WikiLink(__("RecentChangesMyPages"), 'auto', HTML($sp,"MyPages",$sp)) ?></li> - <li id="pt-mychanges"><?php echo WikiLink(__("MyRecentChanges"), 'auto', HTML($sp,"MyChanges",$sp)) ?></li> - <li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li> - <li id="pt-logout"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[logout]').'=1'), $sp,_("Logout"),$sp) ?></li> + $sp = HTML::raw(" "); $id = $user->getAuthenticatedId(); ?> + <li id="pt-mypages"><?php echo WikiLink(__("RecentChangesMyPages"), 'auto', HTML($sp,"MyPages",$sp)) ?></li> + <li id="pt-mychanges"><?php echo WikiLink(__("MyRecentChanges"), 'auto', HTML($sp,"MyChanges",$sp)) ?></li> + <li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li> + <li id="pt-logout"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[logout]').'=1'), $sp,_("Logout"),$sp) ?></li> <?php } elseif (ALLOW_ANON_USER) { $sp = HTML::raw(" "); $id = $user->getAuthenticatedId(); - if ($id) { ?> +if ($id) { ?> <li id="pt-userpage"><?php echo WikiLink($id, 'auto') ?></li> <?php } ?> - <?php // Login ?> <li id="pt-login"><?php echo HTML::a(array('href'=>'?'.urlencode('auth[login]').'=1'),$sp,_("Sign In"),$sp) ?></li> <?php } else { ?> <li id="pt-login"><a id="login"><?php echo _("Login required...") ?></a></li> <?php } ?> - </ul> - </div> +</ul> </div> +</div> </header> Modified: trunk/themes/Wordpress/templates/signin.tmpl =================================================================== --- trunk/themes/Wordpress/templates/signin.tmpl 2021-12-16 16:21:43 UTC (rev 10797) +++ trunk/themes/Wordpress/templates/signin.tmpl 2021-12-16 16:45:16 UTC (rev 10798) @@ -8,8 +8,7 @@ <li> <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>"> <?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?> -<?php } ?> -<?php +<?php } if ($user->isAuthenticated()) { $SignOutB = $WikiTheme->makeButton(_("Sign Out"), "javascript:SignOut();", 'wikiaction'); ?> @@ -31,10 +30,10 @@ </noscript> <?php } else { $SignInInput = HTML::input(array('type' => 'text', - 'name' => "auth[userid]", - 'size' => 12, - 'maxlength' => 256, - 'onchange' => "SignIn(this.form,false);")); + 'name' => "auth[userid]", + 'size' => 12, + 'maxlength' => 256, + 'onchange' => "SignIn(this.form,false);")); $SignInInput->addTooltip(_("Enter your UserId to sign in")); $userid = $user->getId(); if ($user->isSignedIn()) { Modified: trunk/themes/default/templates/signin.tmpl =================================================================== --- trunk/themes/default/templates/signin.tmpl 2021-12-16 16:21:43 UTC (rev 10797) +++ trunk/themes/default/templates/signin.tmpl 2021-12-16 16:45:16 UTC (rev 10798) @@ -7,12 +7,12 @@ <?php if (empty($NOFORM)) { ?> <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>"> <?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?> -<?php } ?> -<?php +<?php } if ($user->isAuthenticated()) { $Sep = $WikiTheme->getButtonSeparator(); $SignOutB = $WikiTheme->makeButton(_("Sign Out"), "javascript:SignOut();", 'wikiaction'); - $SignOutJS = JavaScript(' document.write(\'<input type="hidden" name="auth[logout]" value="0" />\'); + $SignOutJS = JavaScript(' + document.write(\'<input type="hidden" name="auth[logout]" value="0" />\'); function SignOut() { var form = document.forms["'.$FORMNAME.'"]; form.elements["auth[logout]"].value = 1; @@ -21,14 +21,17 @@ document.write(\''.AsXML($SignOutB).'\');'); ?> <?php echo fmt("Authenticated as %s", WikiLink($user->getAuthenticatedId(), 'auto')) ?> - <?php echo $SEP?><?php echo $SignOutJS?> - <noscript><?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?></noscript> + <?php echo $SEP?> + <?php echo $SignOutJS?> + <noscript> + <?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?> + </noscript> <?php } else { $SignInInput = HTML::input(array('type' => 'text', - 'name' => "auth[userid]", - 'size' => 12, - 'maxlength' => 256, - 'onchange' => "SignIn(this.form,false);")); + 'name' => "auth[userid]", + 'size' => 12, + 'maxlength' => 256, + 'onchange' => "SignIn(this.form,false);")); $SignInInput->addTooltip(_("Enter your UserId to sign in")); $userid = $user->getId(); if ($user->isSignedIn()) { Modified: trunk/themes/shamino_com/templates/signin.tmpl =================================================================== --- trunk/themes/shamino_com/templates/signin.tmpl 2021-12-16 16:21:43 UTC (rev 10797) +++ trunk/themes/shamino_com/templates/signin.tmpl 2021-12-16 16:45:16 UTC (rev 10798) @@ -1,5 +1,4 @@ <?php -// signin only implicitly by clicking "Edit" if (empty($FORMNAME)) $FORMNAME = 'signin'; else @@ -20,10 +19,15 @@ } document.write(\''.AsXML($SignOutB).'\');'); ?> - <span class="signin"><?php echo fmt("Authenticated as %s", WikiLink($user->getAuthenticatedId(), 'auto')) ?> - <?php echo $SEP?><?php echo $SignOutJS?></span> + <span class="signin"> + <?php echo fmt("Authenticated as %s", WikiLink($user->getAuthenticatedId(), 'auto')) ?> + <?php echo $SEP?> + <?php echo $SignOutJS?> + </span> <noscript> - <span class="signin"><?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?></span> + <span class="signin"> + <?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?> + </span> </noscript> <?php } ?> <?php if (empty($NOFORM)) { ?> Modified: trunk/themes/smaller/templates/signin.tmpl =================================================================== --- trunk/themes/smaller/templates/signin.tmpl 2021-12-16 16:21:43 UTC (rev 10797) +++ trunk/themes/smaller/templates/signin.tmpl 2021-12-16 16:45:16 UTC (rev 10798) @@ -7,12 +7,12 @@ <?php if (empty($NOFORM)) { ?> <form style="display:inline" method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>"> <?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?> -<?php } ?> -<?php +<?php } if ($user->isAuthenticated()) { $Sep = $WikiTheme->getButtonSeparator(); $SignOutB = $WikiTheme->makeButton(_("Sign Out"), "javascript:SignOut();", 'wikiaction'); - $SignOutJS = JavaScript(' document.write(\'<input type="hidden" name="auth[logout]" value="0" />\'); + $SignOutJS = JavaScript(' + document.write(\'<input type="hidden" name="auth[logout]" value="0" />\'); function SignOut() { var form = document.forms["'.$FORMNAME.'"]; form.elements["auth[logout]"].value = 1; @@ -21,14 +21,16 @@ document.write(\''.AsXML($SignOutB).'\');'); ?> <?php echo $SignOutJS?> - <noscript><?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?></noscript> + <noscript> + <?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?> + </noscript> <?php } else { $SignInInput = HTML::input(array('type' => 'text', - 'name' => "auth[userid]", - 'size' => 12, - 'maxlength' => 256, - 'onchange' => "SignIn(this.form,false);")); - if ($user->isSignedIn()) { // cookie + 'name' => "auth[userid]", + 'size' => 12, + 'maxlength' => 256, + 'onchange' => "SignIn(this.form,false);")); + if ($user->isSignedIn()) { $SignInInput->setAttr('value', $user->getId()); } $SignInInput->addTooltip(_("Enter your UserId to sign in")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-12-16 17:24:42
|
Revision: 10799 http://sourceforge.net/p/phpwiki/code/10799 Author: vargenau Date: 2021-12-16 17:24:40 +0000 (Thu, 16 Dec 2021) Log Message: ----------- templates/body.tmpl: formatting Modified Paths: -------------- trunk/themes/Crao/templates/body.tmpl trunk/themes/MonoBook/templates/body.tmpl trunk/themes/Portland/templates/body.tmpl trunk/themes/Sidebar/templates/body.tmpl trunk/themes/Wordpress/templates/body.tmpl trunk/themes/blog/templates/body.tmpl trunk/themes/default/templates/body.tmpl trunk/themes/wikilens/templates/body.tmpl Modified: trunk/themes/Crao/templates/body.tmpl =================================================================== --- trunk/themes/Crao/templates/body.tmpl 2021-12-16 16:45:16 UTC (rev 10798) +++ trunk/themes/Crao/templates/body.tmpl 2021-12-16 17:24:40 UTC (rev 10799) @@ -1,23 +1,22 @@ <body <?php echo $WikiTheme->getMoreAttr('body') ?> > -<header role="banner"> -<div id="header"><?php // for top toolbars style sheet ?> - <?php echo Template('top') ?> -</div> -</header> -<div class="toolbar"><?php echo Template('navbar') ?></div> -<?php // Page content ?> -<div id="content"> -<?php if (isset($HEADER)) { ?> -<?php // Page title ?> -<h1><?php echo $HEADER ?></h1> -<?php } ?> -<main role="main"> -<?php echo $CONTENT ?> -</main> -<?php echo Template('bottom') ?> -</div> -<?php if (isset($revision)) { ?> -<?php // Actionbar ?> -<?php echo Template('actionbar') ?> -<?php } ?> + <header role="banner"> + <div id="header"> + <?php echo Template('top') ?> + </div> + </header> + <div class="toolbar"> + <?php echo Template('navbar') ?> + </div> + <div id="content"> + <?php if (isset($HEADER)) { ?> + <h1><?php echo $HEADER ?></h1> + <?php } ?> + <main role="main"> + <?php echo $CONTENT ?> + </main> + <?php echo Template('bottom') ?> + </div> + <?php if (isset($revision)) { ?> + <?php echo Template('actionbar') ?> + <?php } ?> </body> Modified: trunk/themes/MonoBook/templates/body.tmpl =================================================================== --- trunk/themes/MonoBook/templates/body.tmpl 2021-12-16 16:45:16 UTC (rev 10798) +++ trunk/themes/MonoBook/templates/body.tmpl 2021-12-16 17:24:40 UTC (rev 10799) @@ -8,8 +8,6 @@ <main role="main"> <div id="bodyContent"> <?php echo $CONTENT ?> - - <?php // end content ?> <div class="clear-floats"></div> </div> </main> Modified: trunk/themes/Portland/templates/body.tmpl =================================================================== --- trunk/themes/Portland/templates/body.tmpl 2021-12-16 16:45:16 UTC (rev 10798) +++ trunk/themes/Portland/templates/body.tmpl 2021-12-16 17:24:40 UTC (rev 10799) @@ -1,19 +1,15 @@ <body <?php echo $WikiTheme->getMoreAttr('body') ?> > -<header role="banner"> -<?php // Page title and logo ?> -<h1><a class="wikilink" + <header role="banner"> + <h1><a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>" ><img src="<?php echo $WikiTheme->getImageURL('logo')?>" alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" - class="bottom" /></a> <?php echo $HEADER?></h1> -</header> -<main role="main"> -<?php echo $CONTENT ?> -</main> -<?php echo Template('navbar') ?> -<?php // RELATEDPAGES were here. ?> - -<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?> - -<?php echo Template('bottom') ?> + class="bottom" /></a> <?php echo $HEADER ?></h1> + </header> + <main role="main"> + <?php echo $CONTENT ?> + </main> + <?php echo Template('navbar') ?> + <?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?> + <?php echo Template('bottom') ?> </body> Modified: trunk/themes/Sidebar/templates/body.tmpl =================================================================== --- trunk/themes/Sidebar/templates/body.tmpl 2021-12-16 16:45:16 UTC (rev 10798) +++ trunk/themes/Sidebar/templates/body.tmpl 2021-12-16 17:24:40 UTC (rev 10799) @@ -1,14 +1,14 @@ - <body <?php echo $WikiTheme->getMoreAttr('body') ?> > +<body <?php echo $WikiTheme->getMoreAttr('body') ?> > <div id="global-wrapper"> <div id="column-content"> <div id="content"> - <main role="main"> + <main role="main"> <?php echo Template('top') ?> <div id="bodyContent"> <?php echo $CONTENT ?> <div class="clear-floats"></div> </div> - </main> + </main> </div> <?php if (!$WikiTheme->DUMP_MODE) { ?> <?php echo Template('logo') ?> @@ -32,4 +32,4 @@ </div> <?php } // !DUMP_MODE ?> </div> - </body> +</body> Modified: trunk/themes/Wordpress/templates/body.tmpl =================================================================== --- trunk/themes/Wordpress/templates/body.tmpl 2021-12-16 16:45:16 UTC (rev 10798) +++ trunk/themes/Wordpress/templates/body.tmpl 2021-12-16 17:24:40 UTC (rev 10799) @@ -1,18 +1,11 @@ <body <?php echo $WikiTheme->getMoreAttr('body') ?> > - -<header role="banner"> -<?php // Page title ?> -<h1 id="header"><?php echo $HEADER ?></h1> -</header> -<main role="main"> -<?php // Page title and logo ?> -<?php echo $CONTENT ?> -</main> -<?php echo Template('navbar') ?> -<?php // RELATEDPAGES were here. ?> - -<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?> - -<?php echo Template('bottom') ?> - + <header role="banner"> + <h1 id="header"><?php echo $HEADER ?></h1> + </header> + <main role="main"> + <?php echo $CONTENT ?> + </main> + <?php echo Template('navbar') ?> + <?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?> + <?php echo Template('bottom') ?> </body> Modified: trunk/themes/blog/templates/body.tmpl =================================================================== --- trunk/themes/blog/templates/body.tmpl 2021-12-16 16:45:16 UTC (rev 10798) +++ trunk/themes/blog/templates/body.tmpl 2021-12-16 17:24:40 UTC (rev 10799) @@ -1,22 +1,18 @@ <body <?php echo $WikiTheme->getMoreAttr('body') ?> > -<div id="page"> -<?php echo Template('top') ?> - -<?php // $CONTENT includes browse.tmpl ?> -<div id="pagetitle"> -<h1 id="pagetitleText"><?php echo $HEADER ?></h1></div> -<main role="main"> -<div id="bodyContent"> -<?php echo $CONTENT?> -</div> -</main> - -<div id="bottom"> -<?php echo Template('bottom') ?> -</div> -<div id="footer"> -<?php echo Template('browse-footer') ?> -</div> - -</div> + <div id="page"> + <?php echo Template('top') ?> + <div id="pagetitle"> + <h1 id="pagetitleText"><?php echo $HEADER ?></h1></div> + <main role="main"> + <div id="bodyContent"> + <?php echo $CONTENT ?> + </div> + </main> + <div id="bottom"> + <?php echo Template('bottom') ?> + </div> + <div id="footer"> + <?php echo Template('browse-footer') ?> + </div> + </div> </body> Modified: trunk/themes/default/templates/body.tmpl =================================================================== --- trunk/themes/default/templates/body.tmpl 2021-12-16 16:45:16 UTC (rev 10798) +++ trunk/themes/default/templates/body.tmpl 2021-12-16 17:24:40 UTC (rev 10799) @@ -1,13 +1,13 @@ <body <?php echo $WikiTheme->getMoreAttr('body') ?> > -<header role="banner"> -<div id="header"> - <?php echo Template('top') ?> -</div> -</header> -<main role="main"> -<div id="content"> -<?php echo $CONTENT ?> -</div> -</main> -<?php echo Template('bottom') ?> + <header role="banner"> + <div id="header"> + <?php echo Template('top') ?> + </div> + </header> + <main role="main"> + <div id="content"> + <?php echo $CONTENT ?> + </div> + </main> + <?php echo Template('bottom') ?> </body> Modified: trunk/themes/wikilens/templates/body.tmpl =================================================================== --- trunk/themes/wikilens/templates/body.tmpl 2021-12-16 16:45:16 UTC (rev 10798) +++ trunk/themes/wikilens/templates/body.tmpl 2021-12-16 17:24:40 UTC (rev 10799) @@ -1,40 +1,38 @@ <body <?php echo $WikiTheme->getMoreAttr('body') ?> > - -<table> -<tr> -<td colspan="2" class="header"> -<header role="banner"> -<div id="header"> - <?php echo Template('top') ?> -</div> -</header> + <table> + <tr> + <td colspan="2" class="header"> + <header role="banner"> + <div id="header"> + <?php echo Template('top') ?> + </div> + </header> + </td> + </tr> + <tr class="top"> + <td class="leftnav" style="width:120px"> + <nav role="navigation" aria-label="<?php echo _("Main Menu") ?>"> + <div class="toolbar"> + <?php echo Template('navbar') ?> + </div> + <hr /> + <<IncludePage page="LeftbarContent" quiet="true" >> + </nav> + </td> + <td class="content"> + <main role="main"> + <h1><?php echo $HEADER ?> + <?php if (!empty($user) && $user->isSignedIn()) { + $loader = new WikiPluginLoader(); + printXML(HTML::raw(" ")); + printXML($loader->expandPI("<"."?plugin RateIt ?".">", $request, $dbi->_markup)); + } ?> </h1> + <div id="content"> + <?php echo $CONTENT ?> + </div> + </main> + <?php echo Template('bottom') ?> </td> </tr> -<tr class="top"> -<td class="leftnav" style="width:120px"> -<nav role="navigation" aria-label="<?php echo _("Main Menu") ?>"> -<div class="toolbar"> - <?php echo Template('navbar') ?> -</div> -<hr /> -<<IncludePage page="LeftbarContent" quiet="true" >> -</nav> -</td> -<td class="content"> -<main role="main"> -<?php // Page title ?> -<h1><?php echo $HEADER ?> -<?php if (!empty($user) && $user->isSignedIn()) { - $loader = new WikiPluginLoader(); - printXML(HTML::raw(" ")); - printXML($loader->expandPI("<"."?plugin RateIt ?".">", $request, $dbi->_markup)); -} ?> </h1> -<div id="content"> -<?php echo $CONTENT ?> -</div> -</main> -<?php echo Template('bottom') ?> -</td> -</tr> </table> </body> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-03 15:14:29
|
Revision: 10809 http://sourceforge.net/p/phpwiki/code/10809 Author: vargenau Date: 2022-01-03 15:14:27 +0000 (Mon, 03 Jan 2022) Log Message: ----------- Avoid null issue in PHP 8 Modified Paths: -------------- trunk/themes/Sidebar/templates/top.tmpl trunk/themes/wikilens/templates/body.tmpl Modified: trunk/themes/Sidebar/templates/top.tmpl =================================================================== --- trunk/themes/Sidebar/templates/top.tmpl 2022-01-03 10:58:16 UTC (rev 10808) +++ trunk/themes/Sidebar/templates/top.tmpl 2022-01-03 15:14:27 UTC (rev 10809) @@ -20,6 +20,7 @@ <div id="rateit-widget-top"> <?php $loader = new WikiPluginLoader(); + $dbi = $request->getDbh(); // Needed in PHP 8 printXML($loader->expandPI("<"."?plugin RateIt show=text ?".">", $request, $dbi->_markup)); ?></div> <?php } ?> Modified: trunk/themes/wikilens/templates/body.tmpl =================================================================== --- trunk/themes/wikilens/templates/body.tmpl 2022-01-03 10:58:16 UTC (rev 10808) +++ trunk/themes/wikilens/templates/body.tmpl 2022-01-03 15:14:27 UTC (rev 10809) @@ -25,6 +25,7 @@ <?php if (!empty($user) && $user->isSignedIn()) { $loader = new WikiPluginLoader(); printXML(HTML::raw(" ")); + $dbi = $request->getDbh(); // Needed in PHP 8 printXML($loader->expandPI("<"."?plugin RateIt ?".">", $request, $dbi->_markup)); } ?> </h1> <div id="content"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-03 17:15:50
|
Revision: 10810 http://sourceforge.net/p/phpwiki/code/10810 Author: vargenau Date: 2022-01-03 17:15:48 +0000 (Mon, 03 Jan 2022) Log Message: ----------- Remove old previews Modified Paths: -------------- trunk/themes/wikilens/templates/body.tmpl Removed Paths: ------------- trunk/themes/Hawaiian/preview.jpg trunk/themes/MacOSX/preview.jpg Deleted: trunk/themes/Hawaiian/preview.jpg =================================================================== (Binary files differ) Deleted: trunk/themes/MacOSX/preview.jpg =================================================================== (Binary files differ) Modified: trunk/themes/wikilens/templates/body.tmpl =================================================================== --- trunk/themes/wikilens/templates/body.tmpl 2022-01-03 15:14:27 UTC (rev 10809) +++ trunk/themes/wikilens/templates/body.tmpl 2022-01-03 17:15:48 UTC (rev 10810) @@ -27,10 +27,8 @@ printXML(HTML::raw(" ")); $dbi = $request->getDbh(); // Needed in PHP 8 printXML($loader->expandPI("<"."?plugin RateIt ?".">", $request, $dbi->_markup)); - } ?> </h1> - <div id="content"> + } ?> </h1> <?php echo $CONTENT ?> - </div> </main> <?php echo Template('bottom') ?> </td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-04 10:10:40
|
Revision: 10813 http://sourceforge.net/p/phpwiki/code/10813 Author: vargenau Date: 2022-01-04 10:10:37 +0000 (Tue, 04 Jan 2022) Log Message: ----------- templates: whitespace Modified Paths: -------------- trunk/themes/Crao/templates/browse.tmpl trunk/themes/MonoBook/templates/browse.tmpl trunk/themes/MonoBook/templates/viewsource.tmpl trunk/themes/Portland/templates/browse.tmpl trunk/themes/Portland/templates/viewsource.tmpl trunk/themes/Wordpress/templates/browse.tmpl trunk/themes/Wordpress/templates/viewsource.tmpl trunk/themes/blog/templates/browse.tmpl trunk/themes/blog/templates/viewsource.tmpl trunk/themes/default/templates/browse.tmpl trunk/themes/default/templates/viewsource.tmpl trunk/themes/fusionforge/templates/browse.tmpl Modified: trunk/themes/Crao/templates/browse.tmpl =================================================================== --- trunk/themes/Crao/templates/browse.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/Crao/templates/browse.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -2,9 +2,9 @@ $action = $request->getArg('action'); ?> <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p class="warning_msg"><?php echo _("Note:")?> - <?php echo _("You are viewing an old revision of this page.")?> - <?php echo Button('browse', _("View the current version."), $page)?> + <p class="warning_msg"><?php echo _("Note:") ?> + <?php echo _("You are viewing an old revision of this page.") ?> + <?php echo Button('browse', _("View the current version."), $page) ?> </p> <?php } ?> <?php if (!empty($redirected)) { ?> Modified: trunk/themes/MonoBook/templates/browse.tmpl =================================================================== --- trunk/themes/MonoBook/templates/browse.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/MonoBook/templates/browse.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -2,13 +2,12 @@ $action = $request->getArg('action'); ?> <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p class="warning_msg"><?php echo _("Note:")?> - <?php echo _("You are viewing an old revision of this page.")?> - <?php echo Button('browse', _("View the current version."), $page)?> + <p class="warning_msg"><?php echo _("Note:") ?> + <?php echo _("You are viewing an old revision of this page.") ?> + <?php echo Button('browse', _("View the current version."), $page) ?> </p> <?php } ?> <?php if (!empty($redirected)) { ?> <p><?php echo $redirected ?></p> <?php } ?> - <?php echo $CONTENT?> Modified: trunk/themes/MonoBook/templates/viewsource.tmpl =================================================================== --- trunk/themes/MonoBook/templates/viewsource.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/MonoBook/templates/viewsource.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -1,7 +1,7 @@ <?php if ($page->get('locked') && !$user->isAdmin()) { ?> - <p class="warning_msg"><strong><?php echo _("Note:")?></strong> - <?php echo _("This page has been locked and cannot be edited.")?> + <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> + <?php echo _("This page has been locked and cannot be edited.") ?> </p> <?php } ?> <?php if ($revision and !$revision->isCurrent()) { ?> @@ -12,8 +12,8 @@ <br class="clear-floats" /> <textarea class="wikiedit" name="content" - rows="<?php echo $request->getPref('editHeight')?>" - cols="<?php echo $request->getPref('editWidth')?>" + rows="<?php echo $request->getPref('editHeight') ?>" + cols="<?php echo $request->getPref('editWidth') ?>" readonly="readonly" ><?php echo $PAGE_SOURCE ?> </textarea> Modified: trunk/themes/Portland/templates/browse.tmpl =================================================================== --- trunk/themes/Portland/templates/browse.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/Portland/templates/browse.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -2,11 +2,10 @@ $action = $request->getArg('action'); ?> <br class="clear-floats" /> - <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p class="warning_msg"><?php echo _("Note:")?> - <?php echo _("You are viewing an old revision of this page.")?> - <?php echo WikiLink($page, 'existing', _("View the current version."))?> + <p class="warning_msg"><?php echo _("Note:") ?> + <?php echo _("You are viewing an old revision of this page.") ?> + <?php echo WikiLink($page, 'existing', _("View the current version.")) ?> </p> <hr class="ignore" /> <?php } ?> @@ -13,9 +12,7 @@ <?php if (!empty($redirected)) { ?> <p><?php echo $redirected ?></p> <?php } ?> - <?php echo $CONTENT?> - <hr /> <?php echo Template('actionbar') ?> <?php // The bottom navigation/search bar ?> Modified: trunk/themes/Portland/templates/viewsource.tmpl =================================================================== --- trunk/themes/Portland/templates/viewsource.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/Portland/templates/viewsource.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -1,7 +1,7 @@ <?php if ($page->get('locked') && !$user->isAdmin()) { ?> - <p class="warning_msg"><strong><?php echo _("Note:")?></strong> - <?php echo _("This page has been locked and cannot be edited.")?> + <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> + <?php echo _("This page has been locked and cannot be edited.") ?> </p> <?php } ?> <?php if ($revision and !$revision->isCurrent()) { ?> @@ -11,8 +11,8 @@ <?php } ?> <textarea class="wikiedit" name="content" - rows="<?php echo $request->getPref('editHeight')?>" - cols="<?php echo $request->getPref('editWidth')?>" + rows="<?php echo $request->getPref('editHeight') ?>" + cols="<?php echo $request->getPref('editWidth') ?>" readonly="readonly" ><?php echo $PAGE_SOURCE ?> </textarea> Modified: trunk/themes/Wordpress/templates/browse.tmpl =================================================================== --- trunk/themes/Wordpress/templates/browse.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/Wordpress/templates/browse.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -2,11 +2,10 @@ $action = $request->getArg('action'); ?> <br class="clear-floats" /> - <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p class="warning_msg"><?php echo _("Note:")?> - <?php echo _("You are viewing an old revision of this page.")?> - <?php echo WikiLink($page, 'existing', _("View the current version."))?> + <p class="warning_msg"><?php echo _("Note:") ?> + <?php echo _("You are viewing an old revision of this page.") ?> + <?php echo WikiLink($page, 'existing', _("View the current version.")) ?> </p> <hr class="ignore" /> <?php } ?> @@ -13,9 +12,7 @@ <?php if (!empty($redirected)) { ?> <p><?php echo $redirected ?></p> <?php } ?> - <?php echo $CONTENT?> - <hr /> <?php echo Template('actionbar') ?> <?php // The bottom navigation/search bar ?> Modified: trunk/themes/Wordpress/templates/viewsource.tmpl =================================================================== --- trunk/themes/Wordpress/templates/viewsource.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/Wordpress/templates/viewsource.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -2,8 +2,8 @@ <?php if (empty($revision)) $revision = $page->getCurrentRevision(false); if ($page->get('locked') && !$user->isAdmin()) { ?> - <p class="warning_msg"><strong><?php echo _("Note:")?></strong> - <?php echo _("This page has been locked and cannot be edited.")?> + <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> + <?php echo _("This page has been locked and cannot be edited.") ?> </p> <?php } ?> <?php if ($revision and !$revision->isCurrent()) { ?> @@ -13,8 +13,8 @@ <?php } ?> <textarea class="wikiedit" name="content" - rows="<?php echo $request->getPref('editHeight')?>" - cols="<?php echo $request->getPref('editWidth')?>" + rows="<?php echo $request->getPref('editHeight') ?>" + cols="<?php echo $request->getPref('editWidth') ?>" readonly="readonly" ><?php echo $PAGE_SOURCE ?> </textarea> Modified: trunk/themes/blog/templates/browse.tmpl =================================================================== --- trunk/themes/blog/templates/browse.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/blog/templates/browse.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -2,23 +2,18 @@ $action = $request->getArg('action'); ?> <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p class="warning_msg"><?php echo _("Note:")?> - <?php echo _("You are viewing an old revision of this page.")?> - <?php echo Button('browse', _("View the current version."), $page)?> + <p class="warning_msg"><?php echo _("Note:") ?> + <?php echo _("You are viewing an old revision of this page.") ?> + <?php echo Button('browse', _("View the current version."), $page) ?> </p> <?php } ?> <?php if (!empty($redirected)) { ?> <p><?php echo $redirected ?></p> <?php } ?> - <div id="content" class="narrowcolumn"> - <?php echo $CONTENT?> - <div class="comments"> </div> - <hr class="printer" /> </div> - <?php echo Template('sidebar')?> Modified: trunk/themes/blog/templates/viewsource.tmpl =================================================================== --- trunk/themes/blog/templates/viewsource.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/blog/templates/viewsource.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -1,8 +1,8 @@ <?php if (empty($revision)) $revision = $page->getCurrentRevision(false); if ($page->get('locked') && !$user->isAdmin()) { ?> - <p class="warning_msg"><strong><?php echo _("Note:")?></strong> - <?php echo _("This page has been locked and cannot be edited.")?> + <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> + <?php echo _("This page has been locked and cannot be edited.") ?> </p> <?php } ?> <?php if (! $revision->isCurrent()) { ?> @@ -14,8 +14,8 @@ <div id="content" class="narrowcolumn"> <textarea class="wikiedit" name="content" - rows="<?php echo $request->getPref('editHeight')?>" - cols="<?php echo $request->getPref('editWidth')?>" + rows="<?php echo $request->getPref('editHeight') ?>" + cols="<?php echo $request->getPref('editWidth') ?>" readonly="readonly" ><?php echo $PAGE_SOURCE ?> </textarea> Modified: trunk/themes/default/templates/browse.tmpl =================================================================== --- trunk/themes/default/templates/browse.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/default/templates/browse.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -2,17 +2,15 @@ $action = $request->getArg('action'); ?> <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p class="warning_msg"><?php echo _("Note:")?> - <?php echo _("You are viewing an old revision of this page.")?> - <?php echo Button('browse', _("View the current version."), $page)?> + <p class="warning_msg"><?php echo _("Note:") ?> + <?php echo _("You are viewing an old revision of this page.") ?> + <?php echo Button('browse', _("View the current version."), $page) ?> </p> <?php } ?> <?php if (!empty($redirected)) { ?> <p><?php echo $redirected ?></p> <?php } ?> - <?php echo $CONTENT?> - <div id="footer"><?php // for top & bottom toolbars stylesheet ?> - <?php echo Template('browse-footer')?> + <?php echo Template('browse-footer') ?> </div> Modified: trunk/themes/default/templates/viewsource.tmpl =================================================================== --- trunk/themes/default/templates/viewsource.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/default/templates/viewsource.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -1,7 +1,7 @@ <?php if ($page->get('locked') && !$user->isAdmin()) { ?> - <p class="warning_msg"><strong><?php echo _("Note:")?></strong> - <?php echo _("This page has been locked and cannot be edited.")?> + <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> + <?php echo _("This page has been locked and cannot be edited.") ?> </p> <?php } ?> <?php if ($revision and !$revision->isCurrent()) { ?> @@ -12,11 +12,11 @@ <br class="clear-floats" /> <textarea class="wikiedit" name="content" - rows="<?php echo $request->getPref('editHeight')?>" - cols="<?php echo $request->getPref('editWidth')?>" + rows="<?php echo $request->getPref('editHeight') ?>" + cols="<?php echo $request->getPref('editWidth') ?>" readonly="readonly" ><?php echo $PAGE_SOURCE ?> </textarea> <div id="footer"><?php // for top & bottom toolbars stylesheet ?> -<?php echo Template('browse-footer')?> + <?php echo Template('browse-footer') ?> </div> Modified: trunk/themes/fusionforge/templates/browse.tmpl =================================================================== --- trunk/themes/fusionforge/templates/browse.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/fusionforge/templates/browse.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -10,9 +10,9 @@ </p> <?php } else { ?> <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p class="warning_msg"><?php echo _("Note:")?> - <?php echo _("You are viewing an old revision of this page.")?> - <?php echo Button('browse', _("View the current version."), $page)?> + <p class="warning_msg"><?php echo _("Note:") ?> + <?php echo _("You are viewing an old revision of this page.") ?> + <?php echo Button('browse', _("View the current version."), $page) ?> </p> <?php } ?> <?php if (!empty($redirected)) { ?> @@ -38,5 +38,5 @@ <?php } ?> <div id="footer"><?php // for top & bottom toolbars stylesheet ?> - <?php echo Template('browse-footer')?> + <?php echo Template('browse-footer') ?> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |