make everything look uniform
This commit is contained in:
Doug Bell
parent
de06822125
commit
e9e6771379
4 changed files with 64 additions and 119 deletions
|
|
@ -486,7 +486,7 @@ sub www_view {
|
|||
$style->setLink( $url->extras('yui/build/datatable/assets/skins/sam/datatable.css'), {rel=>'stylesheet', type=>'text/css'});
|
||||
$style->setLink( $url->extras('yui/build/container/assets/skins/sam/container.css'), {rel=>'stylesheet', type=>'text/css'});
|
||||
$style->setLink( $url->extras('yui/build/menu/assets/skins/sam/menu.css'), {rel=>'stylesheet', type=>'text/css'});
|
||||
$style->setLink( $url->extras('yui-webgui/build/assetManager/assetManager.css' ), { rel => "stylesheet", type => 'text/css' } );
|
||||
#$style->setLink( $url->extras('yui-webgui/build/assetManager/assetManager.css' ), { rel => "stylesheet", type => 'text/css' } );
|
||||
$style->setLink( $url->extras('macro/AdminBar/slidePanel.css'), {type=>'text/css', rel=>'stylesheet'});
|
||||
$style->setLink( $url->extras('admin/admin.css'), { type=>'text/css', rel=>'stylesheet'} );
|
||||
$style->setScript($url->extras('yui/build/yahoo-dom-event/yahoo-dom-event.js'));
|
||||
|
|
@ -521,12 +521,13 @@ __DATA__
|
|||
<dl id="adminBar" class="accordion-menu">
|
||||
<dt id="adminConsole" class="a-m-t clickable">^International("admin console","AdminConsole");</dt>
|
||||
<dd class="a-m-d"><div class="bd">
|
||||
<TMPL_LOOP adminPlugins>
|
||||
<a class="link" target="view" href="<tmpl_var url>">
|
||||
<img src="<tmpl_var icon.small>" style="border: 0px; vertical-align: middle;" alt="icon" />
|
||||
<tmpl_var title>
|
||||
</a>
|
||||
</TMPL_LOOP>
|
||||
<ul id="admin_list">
|
||||
<TMPL_LOOP adminPlugins>
|
||||
<li class="clickable with_icon" style="background-image: url(<tmpl_var icon.small default="^Extras('icon/cog.png');">);">
|
||||
<a href="<tmpl_var url>" target="view"><tmpl_var title></a>
|
||||
</li>
|
||||
</TMPL_LOOP>
|
||||
</ul>
|
||||
</div></dd>
|
||||
<!-- placeholder for version tags -->
|
||||
<dt id="versionTags" class="a-m-t clickable">^International('version tags','VersionTag');</dt>
|
||||
|
|
@ -543,26 +544,27 @@ __DATA__
|
|||
<!-- placeholder for asset helpers -->
|
||||
<dt id="assetHelpers" class="a-m-t clickable">^International('asset helpers','WebGUI');</dt>
|
||||
<dd id="assetHelpers_pane" class="a-m-d"><div class="bd">
|
||||
<h1 id="helper_asset_name"></h1>
|
||||
<h1 class="with_icon" id="helper_asset_name"></h1>
|
||||
<ul id="helper_list">
|
||||
</ul>
|
||||
<h2 style="background-image: url(^Extras(icon/clock.png););">^International('history','Asset');</h2>
|
||||
<h2 class="with_icon" style="background-image: url(^Extras(icon/clock.png););">^International('history','Asset');</h2>
|
||||
<ul id="history_list">
|
||||
</ul>
|
||||
</div></dd>
|
||||
<!-- placeholder for new content menu -->
|
||||
<dt id="newContent" class="a-m-t clickable">^International('1083','Macro_AdminBar');</dt>
|
||||
<dd class="a-m-d"><div class="bd" style="margin: 0; padding: 0">
|
||||
<dl id="newContentBar" class="accordion-menu" style="height: 500px">
|
||||
<dl id="newContentBar" class="accordion-menu">
|
||||
<tmpl_loop newContentTabs>
|
||||
<dt class="a-m-t clickable" id="<tmpl_var id>"><tmpl_var title></dt>
|
||||
<dd class="a-m-d"><div class="bd">
|
||||
<ul class="new_content_list">
|
||||
<tmpl_loop items>
|
||||
<a href="#" onclick="window.admin.addNewContent('<tmpl_var url>'); return false">
|
||||
<img src="<tmpl_var icon>" />
|
||||
<li class="clickable with_icon" onclick="window.admin.addNewContent('<tmpl_var url>'); return false" style="background-image: url(<tmpl_var icon default="^Extras('icon/cog.png');">);">
|
||||
<tmpl_var title>
|
||||
</a>
|
||||
</li>
|
||||
</tmpl_loop>
|
||||
</ul>
|
||||
</div></dd>
|
||||
</tmpl_loop>
|
||||
</dl>
|
||||
|
|
@ -571,22 +573,21 @@ __DATA__
|
|||
|
||||
<div id="wrapper" class="yui-skin-sam">
|
||||
<div id="infoMessageContainer" style="display: none" >
|
||||
<div id="infoMessage" style="background-image: url(^Extras(icon/information.png););"></div>
|
||||
<div id="infoMessage" class="with_icon" style="background-image: url(^Extras(icon/information.png););"></div>
|
||||
</div>
|
||||
<div id="versionTag" style="display: none">
|
||||
<div style="float: right">
|
||||
<span href="#" target="view" id="publishTag" class="clickable">^International('publish','VersionTag');</span>
|
||||
| <span href="#" target="view" id="leaveTag" class="clickable">^International('leave','VersionTag');</span>
|
||||
</div>
|
||||
<a href="#" id="editTag" target="view" style="background-image: ^Extras(icon/tag_blue.png);;"></a>
|
||||
<a href="#" id="editTag" class="with_icon" target="view" style="background-image: ^Extras(icon/tag_blue.png);;"></a>
|
||||
</div>
|
||||
<div id="user">
|
||||
<div style="float: right">
|
||||
<a href="<tmpl_var homeUrl>^International('back to site','VersionTag');</a>
|
||||
| <a href="<tmpl_var logoutUrl>">^International('log out','WebGUI');</a>
|
||||
</div>
|
||||
<a href="<tmpl_var userEditUrl>" target="view">
|
||||
<img src="^Extras(icon/user.png);" class="icon" />
|
||||
<a href="<tmpl_var userEditUrl>" target="view" class="with_icon" style="background-image: url(^Extras(icon/user.png););">
|
||||
<tmpl_var userName>
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -103,6 +103,11 @@
|
|||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.with_icon {
|
||||
padding: 0 0 0 20px;
|
||||
background: no-repeat 2px 50%;
|
||||
}
|
||||
|
||||
img.icon {
|
||||
vertical-align: baseline;
|
||||
}
|
||||
|
|
@ -114,17 +119,11 @@ a:link {
|
|||
#helper_asset_name {
|
||||
font-size: 14pt;
|
||||
margin-left: 5px;
|
||||
padding-left: 20px;
|
||||
background-repeat: no-repeat;
|
||||
background-position: 0 50%;
|
||||
}
|
||||
|
||||
#assetHelpers_pane h2 {
|
||||
font-size: 14pt;
|
||||
margin-left: 5px;
|
||||
padding-left: 20px;
|
||||
background-repeat: no-repeat;
|
||||
background-position: 0 50%;
|
||||
}
|
||||
|
||||
#infoMessageContainer {
|
||||
|
|
@ -139,9 +138,6 @@ a:link {
|
|||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: #ccf;
|
||||
background-position: 0 50%;
|
||||
background-repeat: no-repeat;
|
||||
padding-left: 20px;
|
||||
}
|
||||
|
||||
#infoMessage * {
|
||||
|
|
@ -154,29 +150,52 @@ a:link {
|
|||
padding: 2px;
|
||||
}
|
||||
|
||||
#newContentBar a {
|
||||
display: block;
|
||||
height: 24px;
|
||||
font-size: 12px;
|
||||
padding-left: 4px;
|
||||
}
|
||||
|
||||
#newContentBar a:link, #newContentBar a:visited, #newContentBar a:active {
|
||||
#adminBar a:link, #adminBar a:visited, #adminBar a:active {
|
||||
text-decoration: none;
|
||||
color: black;
|
||||
}
|
||||
|
||||
#helper_list, #history_list {
|
||||
#helper_list, #history_list, #admin_list, .new_content_list {
|
||||
list-style-type: none;
|
||||
margin: 0 0 0 1.5em;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
#helper_list li, #history_list li {
|
||||
#helper_list li, #history_list li, #admin_list a, .new_content_list li {
|
||||
color: black;
|
||||
margin: 0;
|
||||
line-height: 18px;
|
||||
font-size: 10pt;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
#helper_list li.clickable:hover, #history_list li.clickable:hover {
|
||||
#helper_list li.clickable:hover, #history_list li.clickable:hover, #admin_list li.clickable:hover,
|
||||
.new_content_list li.clickable:hover, #adminBar a:hover, #adminBar li:hover a {
|
||||
text-decoration: underline;
|
||||
color: blue;
|
||||
}
|
||||
|
||||
#helper_list li, #history_list li {
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
dl.accordion-menu dt.a-m-t {
|
||||
color: black;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
background: #dddddd url(../yui/build/assets/skins/sam/sprite.png) repeat-x;
|
||||
height: 20px;
|
||||
border: 1px solid #ACACAC;
|
||||
text-align:center;
|
||||
}
|
||||
|
||||
dl.accordion-menu dt.a-m-t:hover {
|
||||
background: #dddddd url(../yui/build/assets/skins/sam/sprite.png) repeat-x 0% -1300px;
|
||||
}
|
||||
|
||||
dl.accordion-menu dt.a-m-t.selected {
|
||||
color: white;
|
||||
background: #ddd url(../yui/build/assets/skins/sam/sprite.png) repeat-x 0% -1400px;
|
||||
border-color: black;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ WebGUI.Admin = function(cfg){
|
|||
self.adminBar = new WebGUI.Admin.AdminBar( self.cfg.adminBarId, { expandMax : true } );
|
||||
self.adminBar.afterShow.subscribe( self.updateAdminBar, self );
|
||||
YAHOO.util.Event.on( window, 'load', function(){ self.adminBar.show( self.adminBar.dt[0].id ) } );
|
||||
self.newContentBar = new WebGUI.Admin.AdminBar( "newContentBar" );
|
||||
self.newContentBar = new WebGUI.Admin.AdminBar( "newContentBar", { expandMax : true } );
|
||||
self.locationBar = new WebGUI.Admin.LocationBar( self.cfg.locationBarId );
|
||||
self.afterNavigate.subscribe( self.locationBar.afterNavigate, self.locationBar );
|
||||
if ( self.currentAssetDef ) {
|
||||
|
|
@ -445,7 +445,7 @@ WebGUI.Admin.prototype.updateAssetHelpers
|
|||
for ( var i = 0; i < assetDef.helpers.length; i++ ) {
|
||||
var helper = assetDef.helpers[i];
|
||||
var li = document.createElement('li');
|
||||
li.className = "clickable";
|
||||
li.className = "clickable with_icon";
|
||||
li.appendChild( document.createTextNode( helper.label ) );
|
||||
this.addHelperHandler( li, helper );
|
||||
helperEl.appendChild( li );
|
||||
|
|
@ -687,7 +687,7 @@ WebGUI.Admin.prototype.updateAssetHistory
|
|||
for ( var i = 0; i < assetDef.revisions.length; i++ ) {
|
||||
var revisionDate = assetDef.revisions[i];
|
||||
var li = document.createElement('li');
|
||||
li.className = "clickable";
|
||||
li.className = "clickable with_icon";
|
||||
|
||||
// Create a descriptive date string
|
||||
var rDate = new Date( revisionDate * 1000 ); // JS requires milliseconds
|
||||
|
|
@ -1677,6 +1677,7 @@ WebGUI.Admin.AdminBar.prototype.show
|
|||
if ( this.currentId ) {
|
||||
// Close the current
|
||||
var old = this.ddById[ this.currentId ];
|
||||
YAHOO.util.Dom.removeClass( this.currentId, "selected" );
|
||||
var oldHeight = this.getExpandHeight( old );
|
||||
if ( !old.anim ) {
|
||||
old.anim = this.getAnim(this.current);
|
||||
|
|
@ -1699,6 +1700,7 @@ WebGUI.Admin.AdminBar.prototype.show
|
|||
}
|
||||
|
||||
var dd = this.ddById[ id ];
|
||||
YAHOO.util.Dom.addClass( id, "selected" );
|
||||
|
||||
if ( !dd.anim ) {
|
||||
dd.anim = this.getAnim(dd);
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@ dl.accordion-menu dd.a-m-d div.ncmct {
|
|||
width: 140px;
|
||||
border-bottom: 1px solid #bbbbbb;
|
||||
color: black;
|
||||
font-weight: bold;
|
||||
font-size: 12px;
|
||||
margin-bottom: 5px;
|
||||
font-family: sans-serif;
|
||||
}
|
||||
|
||||
dl.accordion-menu {
|
||||
|
|
@ -25,27 +22,6 @@ dl#adminBar {
|
|||
width: 160px;
|
||||
}
|
||||
|
||||
dl.accordion-menu dt.a-m-t {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
background-color:#dddddd;
|
||||
background-image: url(btn_bg.jpg);
|
||||
font-weight: bold;
|
||||
height: 20px;
|
||||
color: #444444;
|
||||
border: 1px solid #ACACAC;
|
||||
line-height: 20px;
|
||||
font-size: 12px;
|
||||
text-align:center;
|
||||
font-family: sans-serif;
|
||||
}
|
||||
|
||||
dl.accordion-menu dt.a-m-t-hover{
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
background:#cdcdcd;
|
||||
}
|
||||
|
||||
|
||||
dl.accordion-menu dt.a-m-t-down{
|
||||
margin: 0;
|
||||
|
|
@ -71,6 +47,7 @@ dl.accordion-menu dd.a-m-d {
|
|||
background-image: url(panel_bg.jpg);
|
||||
background-repeat: repeat-x;
|
||||
font-weight: normal;
|
||||
overflow-x: hidden;
|
||||
}
|
||||
|
||||
dl.accordion-menu dd.a-m-d .link,
|
||||
|
|
@ -86,13 +63,11 @@ dl.accordion-menu dd.a-m-d .wgButton {
|
|||
font-family: sans-serif;
|
||||
cursor: pointer;
|
||||
font-weight: normal;
|
||||
font-size: 12px;
|
||||
margin-bottom:5px;
|
||||
margin-left:2px;
|
||||
letter-spacing:0px;
|
||||
text-transform:none;
|
||||
font-variant:normal;
|
||||
line-height:12px;
|
||||
}
|
||||
|
||||
dl.accordion-menu dd.a-m-d .wgButton {
|
||||
|
|
@ -105,58 +80,6 @@ dl.accordion-menu dd.a-m-d .wgButton {
|
|||
-moz-user-select: text;
|
||||
}
|
||||
|
||||
dl.accordion-menu dd.a-m-d .link img {
|
||||
margin-left:-20px;
|
||||
}
|
||||
|
||||
dl.accordion-menu dd.a-m-d .link:hover,
|
||||
dl.accordion-menu dd.a-m-d button.wgButton:hover span {
|
||||
color: blue;
|
||||
background-color: #F5F5F5;
|
||||
}
|
||||
|
||||
html.accordion-menu-js dd.a-m-d{
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
display:none;
|
||||
}
|
||||
|
||||
|
||||
html.accordion-menu-js dd.a-m-d-expand {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
display:block;
|
||||
}
|
||||
|
||||
html.accordion-menu-js dd.a-m-d-before-expand {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
display:block;
|
||||
position:relative;
|
||||
z-index:-1;
|
||||
opacity:0;
|
||||
height:auto !important;
|
||||
visibility:hidden;
|
||||
overflow:visible;
|
||||
}
|
||||
|
||||
|
||||
html.accordion-menu-js dt.a-m-t-expand {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
border-left-color:#222222;
|
||||
color:black;
|
||||
background:#c0c0c0;
|
||||
}
|
||||
|
||||
html.accordion-menu-js dd.a-m-d-anim {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
overflow:hidden;
|
||||
display:block;
|
||||
}
|
||||
|
||||
|
||||
dl.accordion-menu dl.accordion-menu dt.a-m-t {
|
||||
background: #aaa;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue