From: <ru...@us...> - 2009-01-17 14:46:22
|
Revision: 6410 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6410&view=rev Author: rurban Date: 2009-01-17 14:46:16 +0000 (Sat, 17 Jan 2009) Log Message: ----------- move default/hypewiki to Sidebar, now that inheritance search works remove Search title Modified Paths: -------------- trunk/themes/Sidebar/templates/navbar.tmpl Removed Paths: ------------- trunk/themes/Sidebar/sidebar.css trunk/themes/Sidebar/templates/browse-footer.tmpl trunk/themes/default/hwiki.prop trunk/themes/default/hyperapplet.php trunk/themes/default/hyperwiki.php Deleted: trunk/themes/Sidebar/sidebar.css =================================================================== --- trunk/themes/Sidebar/sidebar.css 2009-01-17 14:40:16 UTC (rev 6409) +++ trunk/themes/Sidebar/sidebar.css 2009-01-17 14:46:16 UTC (rev 6410) @@ -1,231 +0,0 @@ -/** - * $Id$ - * - * This incarnation of this stylesheet is a complete rewrite from the - * ground up. - * - * It renders excellent with Mozilla and very good with IE5.1Mac. - * - * No floats are used, for older versions of ie (which apparently hang). - * - * OmniWeb is totally useless with this stylesheet. - * This also has not yet been tested against NS4. - * - */ -@import url("../default/phpwiki.css"); - -/** - * General settings - */ -body { - background: #ffffff; - font-family: Arial, Helvetica, sans-serif; - font-size: 85%; /* The default is too large. But enlarge monospace below */ - margin: 0 0 0 0; -} - -div.wikitext { - margin-left: 0.5em; - /* "paper" borders */ - border-top: 1px solid #e8e6df; - border-left: 1px solid #e8e6df; - border-bottom: 1px solid #b2b2b2; - border-right: 1px solid #b2b2b2; -} - -/** some border colors - ** to play with - #d3d2c8; - #e8e6df; - #6d6a5c; - #b3ae97; - **/ -div#logo img { - /* position: fixed; */ - left: 1ex; - top: 1ex; - margin: 0; -} -/* -div#clock { - position: fixed; - left: 0.7ex; - top: 31ex; -} -div#calendar { - position: fixed; - left: 0.7ex; - top: 31ex; -} -*/ -h1 { - /* position: fixed; */ - top: 0; - /*background: ivory;*/ - padding-top: 0.5ex; - padding-bottom: 0.5ex; - padding-left: 0.25em; - width: 100%; - border-bottom: 2px solid black; -} - -h1 a.backlinks { text-decoration: none; } - -/** - * Common toolbar settings - * Note that div.toolbar is used for other toolbars besides - * #navbar and #actionbar, such as in editpage and removepage - */ -#navbar hr, #actionbar hr { display: none; } -#actionbuttons, #signin { line-height: 2.4ex; } -/* #navbuttons input { margin-bottom: 0.5ex; } */ -.sidebar { line-height: 1em; } -/* #navbuttons { top: 5.5ex; } */ - -/* backlinks button */ -.sidebar a.wikiadmin, .sidebar a.wikiaction { - border: 0; - margin: 0; - padding: 0; - -moz-appearance: none; - -moz-box-sizing: auto; - -moz-border-radius: 0; - background-color: #fff; -} - -/** - * Action links - * bonus for css2 browsers - * localise with dynamic css? - */ -/* -div#actionbuttons:before { - display: block; - content: "Actions"; -} -*/ -/* div#actionbuttons { bottom: 10ex; } */ - -/** - * Sign In - */ -/* div#signin { position: fixed; bottom: 0; } */ -div#signin { margin-bottom: 1ex; } - - -/** - * Search - */ -div#searchholder { - display: inline; - position: relative; -} -#searchGoButton { - background-color: #fff; - border: none; - padding: 0 0 0 0; - height: 15px; - width: 15px; - -moz-appearance: none; - -moz-box-sizing: auto; - -moz-border-radius: 0; - line-height: 1em; - position: absolute; - top: 5px; - left: 132px; -} -#livesearch { - position: relative; - margin-left: 0.5em; -} - -/** - * Last edited - * - * Really the only thing left in in #actionbar - at this point is the date, everything else - has been plucked out. */ -p.editdate { - background: white; - padding: 0.25ex 0.5em; - border-top: 1px solid #e8e6df; - border-left: 1px solid #e8e6df; - border-bottom: 1px solid #d3d2c8; - border-right: 1px solid #e8e6df; - - margin-left: 0.5em; - margin-right: 1em; - margin-top: 0.5ex; - margin-bottom: 0.5ex; -} - -/* -div#actionbar { - color: black; - background: ivory; - border-top: 1px solid #b2b2b2; - width: auto; - position: fixed; - left: 13em; - bottom: 0; - margin: 0; -} -*/ - -/** - * Other - */ -.debug { - margin-left: 0.5em; - left: 0.5em; - /*position: fixed; - top: 42ex; - width: 13em; */ - max-width: 13em; /* ie ignores this */ -} - -/* -div#xhtml-validator { display: none; } - */ - -div#xhtml-validator { - /* position: fixed; */ - right: 0.75em; - /* top: 1ex; */ -} - -.clear-floats { - clear: both; -} - -/* Black Links */ -div.box-title a, div.box-title a:visited, div.box-title a:link { - font-weight: normal; - text-decoration: none; - color: black; -} -div.box-title a:hover { - padding: 0 4px 0 4px; - background-color: ThreedLightShadow; - border: 1px outset; -} - -/* smaller sidebar links */ -div.box-data a, div.box-data a:visited, div.box-data a:link { - text-decoration: none; - color: black; - font-size: smaller; -} - -div.box-data a:hover { - background-color: ThreedLightShadow; - /*background-color: #def;*/ - border: 1px outset; -} -/* For emacs users - * - * Local Variables: - * mode: c - * c-file-style: cc-mode - * End: - */ Deleted: trunk/themes/Sidebar/templates/browse-footer.tmpl =================================================================== --- trunk/themes/Sidebar/templates/browse-footer.tmpl 2009-01-17 14:40:16 UTC (rev 6409) +++ trunk/themes/Sidebar/templates/browse-footer.tmpl 2009-01-17 14:46:16 UTC (rev 6410) @@ -1,5 +0,0 @@ -<?php // -*-html-*- - rcs_id('$Id$'); -?> -<hr class="printer" noshade="noshade" /> -<p class="editdate"><?= $WikiTheme->getLastModifiedMessage($revision) ?></p> Modified: trunk/themes/Sidebar/templates/navbar.tmpl =================================================================== --- trunk/themes/Sidebar/templates/navbar.tmpl 2009-01-17 14:40:16 UTC (rev 6409) +++ trunk/themes/Sidebar/templates/navbar.tmpl 2009-01-17 14:46:16 UTC (rev 6410) @@ -32,7 +32,7 @@ <h5><?= _("Search")?></h5> <div class="pBody"> <?= Template("search", - array('SEARCH_BEFORE' => HTML::h5(_("Search")), /*WikiLink(_("FindPage")*/ + array('SEARCH_BEFORE' => ''/*HTML::h5(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> Deleted: trunk/themes/default/hwiki.prop =================================================================== --- trunk/themes/default/hwiki.prop 2009-01-17 14:40:16 UTC (rev 6409) +++ trunk/themes/default/hwiki.prop 2009-01-17 14:46:16 UTC (rev 6410) @@ -1,26 +0,0 @@ -; layout settings -hypergraph.visualnet.layout.class=hypergraph.visualnet.GenericMDSLayout -;hypergraph.visualnet.layout.class=hypergraph.visualnet.TreeLayout -hypergraph.visualnet.layout.expandingEnabled=false -hypergraph.visualnet.layout.initiallyExpanded=3 -hypergraph.visualnet.GenericMDSLayout.repulsingForce=1 -hypergraph.visualnet.GenericMDSLayout.connectedDisparity=0.3 -hypergraph.visualnet.TreeLayout.maxangle=180 -hypergraph.visualnet.TreeLayout.mindistance=1 -hypergraph.visualnet.TreeLayout.defaultSize=0.1 -; settings for the text. -hypergraph.hyperbolic.text.fontName=Arial -hypergraph.hyperbolic.text.size1=12 -hypergraph.hyperbolic.text.scale1=0.7 -hypergraph.hyperbolic.text.size2=10 -hypergraph.hyperbolic.text.scale2=0.3 -hypergraph.hyperbolic.text.size3=8 -hypergraph.hyperbolic.text.scale3=0.1 -hypergraph.hyperbolic.text.size4=0 -hypergraph.hyperbolic.text.color=#ff0000 -hypergraph.hyperbolic.line.color=#c0c0c0 -#hypergraph.hyperbolic.text.backgroundColor=#ffffff -hypergraph.hyperbolic.background.color=#f0f0f0 -; settings for HExplorerApplet -; hypergraph.applications.hexplorer.GraphPanel.target=contentFrame -hypergraph.applications.hexplorer.GraphPanel.target=_parent Deleted: trunk/themes/default/hyperapplet.php =================================================================== --- trunk/themes/default/hyperapplet.php 2009-01-17 14:40:16 UTC (rev 6409) +++ trunk/themes/default/hyperapplet.php 2009-01-17 14:46:16 UTC (rev 6410) @@ -1,21 +0,0 @@ -<?php -/* Download hyperapplet.jar (or hyperwiki.jar) and GraphXML.dtd from - * http://hypergraph.sourceforge.net/download.html - * and place it into your theme directory. - * Include this php file and adjust the width/height. - * The static version requires a dumped "LinkDatabase.xml" via - * cd themes/default; wget http://localhost/wiki/index.php/LinkDatabase?format=xml -O LinkDatabase.xml - * into the same dir as hyperapplet.jar - */ -global $WikiTheme; -?> -<applet code="hypergraph.applications.hexplorer.HExplorerApplet.class" align="baseline" - archive="<?= $WikiTheme->_finddata("hyperapplet.jar") ?>" - width="160" height="360"> -<?php // the dynamic version: ?> - <!--param name="file" value="<?= WikiURL("LinkDatabase", array('format'=>'xml')) ?>" /--> -<?php // The faster static version: dump it periodically ?> - <param name="file" value="<?= $WikiTheme->_finddata("LinkDatabase.xml") ?>" /> - <!--param name="properties" value="<?= $WikiTheme->_finddata("hwiki.prop") ?>" /--> - <param name="center" value="<?= $page->getName() ?>" /> -</applet> \ No newline at end of file Deleted: trunk/themes/default/hyperwiki.php =================================================================== --- trunk/themes/default/hyperwiki.php 2009-01-17 14:40:16 UTC (rev 6409) +++ trunk/themes/default/hyperwiki.php 2009-01-17 14:46:16 UTC (rev 6410) @@ -1,16 +0,0 @@ -<?php - /* Download hyperwiki.jar and GraphXML.dtd from - * http://hypergraph.sourceforge.net/download.html - * and place it into your theme directory. - * Include this php file and adjust the width/height. - */ -global $WikiTheme; - // via the RPC interface it goes like this... -?> -<applet code="hypergraph.applications.hwiki.HWikiApplet.class" - archive="<?= $WikiTheme->_finddata("hyperwiki.jar") ?>" - width="162" height="240"> - <param name="startPage" value="<?= $page->getName() ?>" /> - <param name="properties" value="<?= $WikiTheme->_finddata("hwiki.prop") ?>" /> - <param name="wikiURL" value="<?= PHPWIKI_BASE_URL ?>" /> -</applet> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |