Thread: [Phpcms-plugins-cvs] admin4phpCMS/modules/layout gui.js,NONE,1.1 gui.css,NONE,1.1 layout.tpl,1.1,1.2
Brought to you by:
mjahn
From: Martin J. <mj...@us...> - 2004-07-24 08:58:34
|
Update of /cvsroot/phpcms-plugins/admin4phpCMS/modules/layout In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24990/modules/layout Modified Files: layout.tpl layout.css layout.xml class.module_layout.php Added Files: gui.js gui.css Log Message: changed some things --- NEW FILE: gui.css --- ul.horizontal { } ul.tabbed { padding: 3px 0; margin-left: 0; border-bottom: 1px solid #778; font: bold 12px Verdana, sans-serif; } ul.tabbed li { list-style: none; margin: 0; display: inline; } ul.tabbed li a { padding: 3px 0.5em; margin-left: 3px; border: 1px solid #778; border-bottom: none; background: #DDE; text-decoration: none; } ul.tabbed li a:link { color: #448; } ul.tabbed li a:visited { color: #667; } ul.tabbed li a:hover { color: #000; background: #AAE; border-color: #227; } ul.tabbed li a#current { background: white; border-bottom: 1px solid white; } /** * CSS-Anweisungen für die Konfigurationscontainer **/ div.config { width:40em; margin-top:1em; } div.config ul { margin:0; padding:0; } div.config ul li a { background:#eee; color:black; } div.config ul li a.current { background:#ccc; color:black; } div.config ul li a:hover { background:#ccc; color:black; } div.config div { padding:0.3em; } Index: class.module_layout.php =================================================================== RCS file: /cvsroot/phpcms-plugins/admin4phpCMS/modules/layout/class.module_layout.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- class.module_layout.php 18 Jun 2004 15:17:01 -0000 1.8 +++ class.module_layout.php 24 Jul 2004 08:58:24 -0000 1.9 @@ -30,6 +30,9 @@ /* * $Log$ +* Revision 1.9 2004/07/24 08:58:24 mjahn +* changed some things +* * Revision 1.8 2004/06/18 15:17:01 mjahn * module filemanager and editor included * @@ -199,7 +202,7 @@ case 'submenu': // set the submenu block - $actiondata = array ('_type'=>'ulist', '_id'=>'submenu', 'id'=>'submenu'); + $actiondata = array ('_type'=>'ulist', '_id'=>'submenu', 'extra'=>'id="submenu""'); $this->_callEvent('LAYOUT_ADD_ELEMENT', $actiondata); // get the error-messages $actiondata = array ('_root'=>'submenu'); @@ -253,8 +256,10 @@ // check if there is a layout-template for the type of this element if (!isset ($element['_type']) || !isset ($this->_layout[$element['_type']])) { + //echo '<p>Undefined layout type: '.$element['_type'].'</p>'."\n"; return ''; } + //echo '<p>Defined layout type: '.$element['_type'].'</p>'."\n"; if (!isset($element['content'])) { $element['content'] = ''; @@ -310,6 +315,10 @@ return $o; } + function _setTags () { + $this->_defaultTags = array (); + } + /** * Parse the template-file * Index: layout.xml =================================================================== RCS file: /cvsroot/phpcms-plugins/admin4phpCMS/modules/layout/layout.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- layout.xml 18 Jun 2004 15:17:01 -0000 1.4 +++ layout.xml 24 Jul 2004 08:58:24 -0000 1.5 @@ -4,155 +4,141 @@ <layout:insert name="empty"> <![CDATA[ - <layout:replace name="content" /> +<layout:replace name="content" /> ]]> </layout:insert> <layout:insert name="block"> <![CDATA[ - <div <layout:replace name="extra" default="" />> - <layout:replace name="content" /> - </div> +<div <layout:replace name="extra" default="" />> + <layout:replace name="content" /> +</div> ]]> </layout:insert> <layout:insert name="column_block"> <![CDATA[ - <div <layout:replace name="extra" default="" />> - <layout:replace name="content" /> - <br style="clear:both;" /> - </div> + <div <layout:replace name="extra" default="" />> +<layout:replace name="content" /> + <br style="clear:both;" /> +</div> ]]> </layout:insert> <layout:insert name="column"> <![CDATA[ - <div <layout:replace name="extra" default="" /> style="float:left;"> - <layout:replace name="content" /> - </div> +<div <layout:replace name="extra" default="" /> style="float:left;"> + <layout:replace name="content" /> +</div> ]]> </layout:insert> <layout:insert name="inline"> <![CDATA[ - <span <layout:replace name="extra" default="" />> - <layout:replace name="content" /> - </span> +<span <layout:replace name="extra" default="" />> + <layout:replace name="content" /> +</span> ]]> </layout:insert> <layout:insert name="paragraph"> <![CDATA[ - <p <layout:replace name="extra" default="" />><layout:replace name="content" /></p> +<p <layout:replace name="extra" default="" />><layout:replace name="content" /></p> ]]> </layout:insert> <layout:insert name="hr"> <![CDATA[ - <hr <layout:replace name="extra" default="" /> /> +<hr <layout:replace name="extra" default="" /> /> ]]> </layout:insert> <layout:insert name="headline"> <![CDATA[ - <h2 <layout:replace name="extra" default="" />> - <layout:replace name="content" /> - </h2> +<h2 <layout:replace name="extra" default="" />><layout:replace name="content" /></h2> ]]> </layout:insert> <layout:insert name="image"> <![CDATA[ - <img src="<layout:replace name="src" />" width="<layout:replace name="width" />" height="<layout:replace name="height" />" title="<layout:replace name="title" />" alt="<layout:replace name="alt" />" <layout:replace name="extra" default="" /> /> +<img src="<layout:replace name="src" />" width="<layout:replace name="width" />" height="<layout:replace name="height" />" title="<layout:replace name="title" />" alt="<layout:replace name="alt" />" <layout:replace name="extra" default="" /> /> ]]> </layout:insert> <layout:insert name="link"> <![CDATA[ - <a href="<layout:replace name="href" />" title="<layout:replace name="title" />"> - <layout:replace name="content" /> - </a> +<a href="<layout:replace name="href" />" title="<layout:replace name="title" />" <layout:replace name="extra" default="" />><layout:replace name="content" /></a> ]]> </layout:insert> <layout:insert name="form"> <![CDATA[ - <form action="<layout:replace name="action" default="" />" <layout:replace name="extra" default="" /> method="<layout:replace name="method" default="post" />" enctype="x-form/multipart"> - <layout:replace name="content" /> - </form> +<form action="<layout:replace name="action" default="" />" <layout:replace name="extra" default="" /> method="<layout:replace name="method" default="post" />" enctype="x-form/multipart"> + <layout:replace name="content" /> +</form> ]]> </layout:insert> <layout:insert name="form_fieldset"> <![CDATA[ - <fieldset> - <legend><layout:replace name="title" /></legend> - <layout:replace name="content" /> - </fieldset> +<fieldset> + <legend><layout:replace name="title" /></legend> + <layout:replace name="content" /> +</fieldset> ]]> </layout:insert> <layout:insert name="form_input_hidden"> <![CDATA[ - <input type="hidden" name="<layout:replace name="name" />" value="<layout:replace name="value" />" <layout:replace name="extra" default="" /> /> +<input type="hidden" name="<layout:replace name="name" />" value="<layout:replace name="value" />" <layout:replace name="extra" default="" /> /> ]]> </layout:insert> <layout:insert name="form_input_text"> <![CDATA[ - <label> - <span> - <layout:replace name="label" /> - </span> - <input type="text" name="<layout:replace name="name" />" value="<layout:replace name="value" />" <layout:replace name="extra" default="" /> /> - </label> +<label> + <span> + <layout:replace name="label" /> + </span> + <input type="text" name="<layout:replace name="name" />" value="<layout:replace name="value" />" <layout:replace name="extra" default="" /> /> +</label> ]]> </layout:insert> <layout:insert name="form_input_password"> <![CDATA[ - <label> - <span> - <layout:replace name="label" default="" /> - </span> - <input type="password" name="<layout:replace name="name" />" value="<layout:replace name="value" />" <layout:replace name="extra" default="" /> /> - </label> +<label><span><layout:replace name="label" default="" /></span><input type="password" name="<layout:replace name="name" />" value="<layout:replace name="value" />" <layout:replace name="extra" default="" /> /></label> ]]> </layout:insert> <layout:insert name="form_radio"> <![CDATA[ - <label><input type="radio" name="<layout:replace name="name" />" value="<layout:replace name="value" />" <layout:replace name="extra" default="" /> /><label /></label> +<label><input type="radio" name="<layout:replace name="name" />" value="<layout:replace name="value" />" <layout:replace name="extra" default="" /> /><label /></label> ]]> </layout:insert> <layout:insert name="form_checkbox"> <![CDATA[ - <label> - <span> - <layout:replace name="label" default="" /> - </span> - <input type="checkbox" name="<layout:replace name="name" />" value="<layout:replace name="value" />" <layout:replace name="extra" default="" /> /> - </label> +<label><span><layout:replace name="label" default="" /></span><input type="checkbox" name="<layout:replace name="name" />" value="<layout:replace name="value" />" <layout:replace name="extra" default="" /> /></label> ]]> </layout:insert> <layout:insert name="form_checkbox_simple"> <![CDATA[ - <input type="checkbox" name="<layout:replace name="name" />" value="<layout:replace name="value" />" <layout:replace name="extra" default="" /> /> +<input type="checkbox" name="<layout:replace name="name" />" value="<layout:replace name="value" />" <layout:replace name="extra" default="" /> /> ]]> </layout:insert> @@ -160,84 +146,90 @@ <layout:insert name="form_textarea"> <![CDATA[ - <label> - <span> - <layout:replace name="label" default="" /> - </span> - <textarea name="<layout:replace name="name" />" <layout:replace name="extra" default="" />><layout:replace name="value" /></textarea> - </label> +<label><span><layout:replace name="label" default="" /></span><textarea name="<layout:replace name="name" />" <layout:replace name="extra" default="" />><layout:replace name="value" /></textarea></label> ]]> </layout:insert> <layout:insert name="form_button"> <![CDATA[ - <button type="<layout:replace name="type" />" name="<layout:replace name="name" />" value="<layout:replace name="value" />" <layout:replace name="extra" default="" />> - <layout:replace name="text" /> - </button> +<button type="<layout:replace name="type" />" name="<layout:replace name="name" />" value="<layout:replace name="value" />" <layout:replace name="extra" default="" />><layout:replace name="text" /></button> ]]> </layout:insert> <layout:insert name="menu_main_entry"> <![CDATA[ - <li <layout:replace name="extra" default="" />> - <a href="?moduleid=<layout:replace name="module" />&<layout:replace name="params" />"> - <layout:replace name="name" /> - </a> - </li> +<li <layout:replace name="extra" default="" />><a href="?moduleid=<layout:replace name="module" />&<layout:replace name="params" />"><layout:replace name="name" /> </a></li> ]]> </layout:insert> <layout:insert name="ulist"> <![CDATA[ - <ul <layout:replace name="extra" default="" />> - <layout:replace name="content" /> - </ul> +<ul <layout:replace name="extra" default="" />> + <layout:replace name="content" /> +</ul> ]]> </layout:insert> <layout:insert name="olist"> <![CDATA[ - <ol <layout:replace name="extra" default="" />> - <layout:replace name="content" /> - </ol> +<ol <layout:replace name="extra" default="" />> + <layout:replace name="content" /> +</ol> ]]> </layout:insert> <layout:insert name="menu_sub_entry"> <![CDATA[ - <li <layout:replace name="extra" default="" />> - <a href="?moduleid=<layout:replace name="module" />&action=<layout:replace name="action" />&<layout:replace name="param" />"> - <layout:replace name="name" /> - </a> - </li> + <li <layout:replace name="extra" default="" />><a href="?moduleid=<layout:replace name="module" />&action=<layout:replace name="action" />&<layout:replace name="param" />"><layout:replace name="name" /> </a></li> ]]> </layout:insert> <layout:insert name="list_entry"> <![CDATA[ - <li <layout:replace name="extra" default="" />> - <layout:replace name="content" /> - </li> +<li <layout:replace name="extra" default="" />><layout:replace name="content" /></li> ]]> </layout:insert> <layout:insert name="filelist_entry"> <![CDATA[ - <li <layout:replace name="extra" default="" />> - <layout:replace name="content" /> - <span class="filemtime" title="Last modified"><layout:replace name="filemtime" /></span> - <span class="filesize" title="Dateigröße"><layout:replace name="filesize" /></span> - <span class="chmod" title="Besitzer: <layout:replace name="uid" />\nGruppe: <layout:replace name="gid" />"><layout:replace name="chmod" /></span> - </li> +<li <layout:replace name="extra" default="" />><layout:replace name="content" /><span class="filemtime" title="Last modified"><layout:replace name="filemtime" /></span><span class="filesize" title="Dateigröße"><layout:replace name="filesize" /></span><span class="chmod" title="Besitzer: <layout:replace name="uid" />\nGruppe: <layout:replace name="gid" />"><layout:replace name="chmod" /></span></li> ]]> </layout:insert> + + + <layout:insert name="tabbed_box"> + <![CDATA[ +<div class="tabbedBox"><layout:replace name="content" default="" /></div> + ]]> + </layout:insert> + + + <layout:insert name="box"> + <![CDATA[ +<div class="box"><layout:replace name="content" default="" /></div> + ]]> + </layout:insert> + + + <layout:insert name="tab"> + <![CDATA[ +<div class="tab"><layout:replace name="content" default="" /></div> + ]]> + </layout:insert> + + + <layout:insert name="script"> + <![CDATA[ +<script <layout:replace name="extra" default="" /> type="text/javascript"><layout:replace name="content" default="" /></script> + ]]> + </layout:insert> </layout> \ No newline at end of file Index: layout.tpl =================================================================== RCS file: /cvsroot/phpcms-plugins/admin4phpCMS/modules/layout/layout.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- layout.tpl 18 Jun 2004 15:17:01 -0000 1.1 +++ layout.tpl 24 Jul 2004 08:58:24 -0000 1.2 @@ -9,6 +9,8 @@ <meta name="language" content="de" /> <meta http-equiv="imagetoolbar" content="no" /> <link rel="stylesheet" href="modules/layout/layout.css" type="text/css" /> + <link rel="stylesheet" href="modules/layout/gui.css" type="text/css" /> + <script type="text/javascript" src="modules/layout/gui.js"></script> </head> <body> <div id="menu"> @@ -20,7 +22,13 @@ </p> </div> <div id="content"> - <phpcms-admin:replace name="submenu" /> + <div class="status"> + <phpcms:admin:replace name="username" /><phpcms:admin:replace name="userstatus" /> + <phpcms:admin:replace name="datum" /> + + + <phpcms-admin:replace name="submenu" /> + </div> <div class="content"> <phpcms-admin:replace name="error" /> <phpcms-admin:replace name="content" /> --- NEW FILE: gui.js --- var tabs = new Array (); /** * display a tab and hide all other tabs **/ function displayTab (id) { var i = 0; num = tabs.length; for (i = 0; i < num; i++) { if (tabs [i] != id) { hideTab (tabs [i]); /* alert ('hideTab (' + tabs [i] + ')');*/ continue; } showTab (tabs [i]); /* alert ('showTab (' + tabs [i] + ')');*/ } } /** * helper-function to hide a tab **/ function hideTab (id) { document.getElementById (id).style.display = 'none'; } /** * helper-function to display a tab **/ function showTab (id) { document.getElementById (id).style.display = 'block'; } /** * register a tabbox **/ function registerTab (id) { tabs.push (id); } window.onload = function onloadHide () { displayTab (tabs [0]); } Index: layout.css =================================================================== RCS file: /cvsroot/phpcms-plugins/admin4phpCMS/modules/layout/layout.css,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- layout.css 18 Jun 2004 15:17:01 -0000 1.2 +++ layout.css 24 Jul 2004 08:58:24 -0000 1.3 @@ -9,7 +9,7 @@ } #content { - margin-left:190px; + margin-left:192px; padding:0; background:#fff; } @@ -25,25 +25,46 @@ top:0; left:0; height:100%; - width:190px; + width:170px; margin:0; - padding:0; - border-right:0.1em solid #000; - border-bottom:0.1em solid #000; - background:#fff; + padding:0 10px; + border-right:2px outset #eee; + border-bottom:2px outset #eee; + background:#eee; +} + +#menu p { + padding:0.2em; + border:2px inset #eee; } #menu ul { list-style-type:none; padding:0; margin:0; + background:#eee; } #menu ul li { - padding:0.2em; - margin:0.1em; + padding:0; + margin:0; } +#menu ul li a { + padding:0.2em 0.5em; + margin:0.5em 0.1em; + display:block; + background:#ddd; + border:2px outset #ddd; + text-decoration:none; +} + +#menu ul li.active a, +#menu ul li a:hover { + background:#ddd; + border:2px inset #ddd; +} + #menu ul li ul { margin-left:1em; } @@ -71,7 +92,7 @@ font: bold Verdana, sans-serif; position:fixed; top:0; -left:191px; +left:192px; width:80%; } |