diff options
| -rw-r--r-- | bit_setup_inc.php | 6 | ||||
| -rw-r--r-- | inline.css | 42 | ||||
| -rw-r--r-- | templates/admin_columns.tpl | 8 | ||||
| -rw-r--r-- | templates/admin_custom_modules.tpl | 4 | ||||
| -rw-r--r-- | templates/admin_layout.tpl | 12 | ||||
| -rw-r--r-- | templates/admin_layout_overview.tpl | 12 | ||||
| -rw-r--r-- | templates/admin_themes_manager.tpl | 14 | ||||
| -rw-r--r-- | templates/icon_browser.tpl | 8 | ||||
| -rw-r--r-- | templates/module_config_inc.tpl | 14 |
9 files changed, 82 insertions, 38 deletions
diff --git a/bit_setup_inc.php b/bit_setup_inc.php index 47b747c..4bd6650 100644 --- a/bit_setup_inc.php +++ b/bit_setup_inc.php @@ -50,4 +50,8 @@ if( $gBitSystem->isFeatureActive( 'site_fancy_zoom' )) { } $gBitSystem->mOnload[] = 'setupShowHide();'; -?> + +// styles formerly included inline (kernel, themes). hopefully not needed anymore sometime in the future +$gBitThemes->loadCss(THEMES_PKG_PATH.'inline.css'); + +?>
\ No newline at end of file diff --git a/inline.css b/inline.css new file mode 100644 index 0000000..866e9ef --- /dev/null +++ b/inline.css @@ -0,0 +1,42 @@ +.aligncenter {text-align:center} +.alignright {text-align:right} +.aligntop, aligntop * {vertical-align:top} +.alignmiddle {vertical-align:middle} + + +.floatright {float:right} +.floatleft {float:left} + +.clearright {clear:right} +.cursordefault {cursor:default} + +.width100p {width:100%} +.width85p {width:85%} +.width70p {width:70%} +.width48p {width:48%} +.width40p {width:40%} +.width33p {width:33%} +.width30p {width:30%} +.width29p {width:29%} +.width25p {width:25%} +.width15p {width:15%} +.width10p {width:10%} +.width5p {width:5%} +.width2p {width:2%} +.width1p {width:1%} + +.monospace {font-family:monospace} +.layouts_table {width:100%;border-collapse:collapse;cell-spacing:0} +.layouts_table td {padding:5px} +.splitstyle {border-right:3px solid #000} + +.bg_ace {background:#ace} +.bg_eca {background:#eca} +.bg_aec {background:#aec} +.bg_cae {background:#cae} +.bg_cea {background:#cea} +.bg_eee {background:#eee} +.b3-s-fff {border-bottom:3px solid #fff} + +.marginleft20px {margin-left:20px} +.marginleft0 {margin-left:0}
\ No newline at end of file diff --git a/templates/admin_columns.tpl b/templates/admin_columns.tpl index 6b8e797..215cffa 100644 --- a/templates/admin_columns.tpl +++ b/templates/admin_columns.tpl @@ -1,6 +1,5 @@ {strip} - {form} {formfeedback hash=$feedback} @@ -8,7 +7,6 @@ {jstab title="Columns"} <input type="hidden" name="page" value="{$page}" /> - {assign var=splitstyle value="border-right:3px solid #000"} {legend legend="Visible Columns and Areas"} {formhelp warning="If checked, the column is visible."} @@ -34,7 +32,7 @@ <tr> <th>{tr}Package{/tr}</th> {foreach from=$hideableAreas item=areaname key=area} - <th style="width:15%">{tr}{$areaname}{/tr}</th> + <th class="width15p">{tr}{$areaname}{/tr}</th> {/foreach} </tr> </thead> @@ -63,7 +61,7 @@ <tr> <th>{tr}Mode{/tr}</th> {foreach from=$hideableAreas item=areaname key=area} - <th style="width:15%">{tr}{$areaname}{/tr}</th> + <th class="width15p">{tr}{$areaname}{/tr}</th> {/foreach} </tr> </thead> @@ -111,7 +109,7 @@ <td>{$name}</td> {foreach from=$hideableAreas item=areaname key=area name=areas} {foreach from=$displayModes item=modename key=mode name=modes} - <td style="{if $smarty.foreach.modes.last && !$smarty.foreach.areas.last}{$splitstyle}{/if}"> + <td class="{if $smarty.foreach.modes.last && !$smarty.foreach.areas.last}splitstyle{/if}"> <input type="checkbox" name="hide[{$package}_{$mode}_hide_{$area}_col]" value="y" {if $gBitSystem->isFeatureActive("`$package`_`$mode`_hide_`$area`_col")}checked="checked"{/if} /> </td> {/foreach} diff --git a/templates/admin_custom_modules.tpl b/templates/admin_custom_modules.tpl index dc58212..e68a667 100644 --- a/templates/admin_custom_modules.tpl +++ b/templates/admin_custom_modules.tpl @@ -1,4 +1,4 @@ -{* $Header: /cvsroot/bitweaver/_bit_themes/templates/admin_custom_modules.tpl,v 1.1 2007/04/02 18:55:01 squareing Exp $ *} +{* $Header: /cvsroot/bitweaver/_bit_themes/templates/admin_custom_modules.tpl,v 1.2 2008/09/29 11:56:31 laetzer Exp $ *} {strip} {if $smarty.request.preview} @@ -55,7 +55,7 @@ <tr class="{cycle values="odd,even"}"> <td>{$customModules[user].name|escape}</td> <td>{$customModules[user].title|escape}</td> - <td style="text-align:right"> + <td class="alignright"> <a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=layout&module_name=_custom%3Acustom%2F{$customModules[user].name}">{biticon ipackage="icons" iname="mail-attachment" iexplain=assign}</a> <a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=custom_modules&name={$customModules[user].name}&action=edit">{biticon ipackage="icons" iname="accessories-text-editor" iexplain=edit}</a> <a href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=custom_modules&name={$customModules[user].name}&action=remove">{biticon ipackage="icons" iname="edit-delete" iexplain=delete}</a> diff --git a/templates/admin_layout.tpl b/templates/admin_layout.tpl index 8c3bfb7..b5b95c6 100644 --- a/templates/admin_layout.tpl +++ b/templates/admin_layout.tpl @@ -52,21 +52,21 @@ </noscript> {/form} - <table style="width:100%" cellpadding="5" cellspacing="0" border="0"> + <table class="layouts_table"> <caption>{tr}Current Layout of '{if !$module_package || $module_package=='kernel'}Site Default{else}{$module_package|capitalize}{/if}'{/tr}</caption> <tr> {foreach from=$layoutAreas item=area key=colkey} {if $colkey =='top'} - <td class="{cycle values="even,odd"}" colspan="3" style="vertical-align:top;"> + <td class="{cycle values="even,odd"} aligntop" colspan="3"> {elseif $colkey =='bottom'} </tr> <tr> - <td class="{cycle values="even,odd"}" colspan="3" style="vertical-align:top;"> + <td class="{cycle values="even,odd"} aligntop" colspan="3"> {else} - <td class="{cycle values="even,odd"}" style="width:33%; vertical-align:top;"> + <td class="{cycle values="even,odd"} width33p aligntop"> {/if} - <table class="data" style="width:100%"> + <table class="data width100p"> <tr> <th>{tr}{$colkey} area{/tr}</th> </tr> @@ -78,7 +78,7 @@ </tr> {sectionelse} <tr> - <td colspan="3" align="center"> + <td colspan="3" class="aligncenter"> {if $colkey eq 'center'}{tr}Default{/tr}{else}{tr}None{/tr}{/if} </td> </tr> diff --git a/templates/admin_layout_overview.tpl b/templates/admin_layout_overview.tpl index 4491a3d..7a5d50d 100644 --- a/templates/admin_layout_overview.tpl +++ b/templates/admin_layout_overview.tpl @@ -45,21 +45,21 @@ {tr}Current Layout of {if $TabTitle == 'Default'}Site Default{else}{$TabTitle}{/if}{/tr} </h1> - <table style="width:100%" cellpadding="5" cellspacing="0" border="0"> + <table class="layouts_table"> <tr> {cycle values="even,odd" print=0} {foreach from=$layoutAreas item=area key=colkey} {if $colkey =='top'} - <td class="{cycle}" colspan="3" style="vertical-align:top;"> + <td class="{cycle} aligntop" colspan="3"> {elseif $colkey =='bottom'} </tr> <tr> - <td class="{cycle}" colspan="3" style="vertical-align:top;"> + <td class="{cycle} aligntop" colspan="3"> {else} - <td class="{cycle}" style="width:33%; vertical-align:top;"> + <td class="{cycle} width33p aligntop"> {/if} - <table class="data" style="width:100%"> + <table class="data width100p> <tr> <th>{tr}{$colkey} area{/tr}</th> </tr> @@ -71,7 +71,7 @@ </tr> {sectionelse} <tr> - <td colspan="3" align="center"> + <td colspan="3" class="aligncenter"> {if $colkey eq 'center'}{tr}Default{/tr}{else}{tr}None{/tr}{/if} </td> </tr> diff --git a/templates/admin_themes_manager.tpl b/templates/admin_themes_manager.tpl index d837278..a592545 100644 --- a/templates/admin_themes_manager.tpl +++ b/templates/admin_themes_manager.tpl @@ -74,13 +74,13 @@ {/legend} <ul class="help"> - <li style="background:#ace; border-bottom:3px solid #fff;">{tr}Header: Found at the top of a website - contains website title and slogan.{/tr}</li> - <li style="background:#eca; border-bottom:3px solid #fff;">{tr}Content: The main content bearing section of a website.{/tr}</li> - <li style="background:#aec; border-bottom:3px solid #fff;">{tr}Navigation: Usually found on the left hand side - frequently contains links to important pages.{/tr}</li> - <li style="background:#cae; border-bottom:3px solid #fff;">{tr}Extra: Sometimes found on the right hand side - frequently contains adidtional information and links.{/tr}</li> - <li style="background:#cea; border-bottom:3px solid #fff;">{tr}Footer: Usually found at the bottom of a website - contains copyright information and 'powered by' link.{/tr}</li> - <li style="background:#eee; border-bottom:3px solid #fff;">{tr}px: Indicates that the block is set using a defined pixel width.{/tr}</li> - <li style="background:#eee; border-bottom:3px solid #fff;">{tr}%: Indicates that the block is set using a percentage, making it fluid in terms of browser window width.{/tr}</li> + <li class="bg_ace b3-s-fff">{tr}Header: Found at the top of a website - contains website title and slogan.{/tr}</li> + <li class="bg_eca b3-s-fff">{tr}Content: The main content bearing section of a website.{/tr}</li> + <li class="bg_aec b3-s-fff">{tr}Navigation: Usually found on the left hand side - frequently contains links to important pages.{/tr}</li> + <li class="bg_cae b3-s-fff">{tr}Extra: Sometimes found on the right hand side - frequently contains adidtional information and links.{/tr}</li> + <li class="bg_cea b3-s-fff">{tr}Footer: Usually found at the bottom of a website - contains copyright information and 'powered by' link.{/tr}</li> + <li class="bg_eee b3-s-fff">{tr}px: Indicates that the block is set using a defined pixel width.{/tr}</li> + <li class="bg_eee b3-s-fff">{tr}%: Indicates that the block is set using a percentage, making it fluid in terms of browser window width.{/tr}</li> </ul> {/jstab} diff --git a/templates/icon_browser.tpl b/templates/icon_browser.tpl index 6ebe7b2..462b8ae 100644 --- a/templates/icon_browser.tpl +++ b/templates/icon_browser.tpl @@ -11,12 +11,12 @@ </p> <table class="data"> <tr> - <th style="width:1%;" colspan="2">{tr}Default Icons{/tr}</th> + <th class="width1p" colspan="2">{tr}Default Icons{/tr}</th> {if $activeIconList} - <th style="width:1%;" colspan="2">{tr}Active Icons{/tr}</th> + <th class="width1p" colspan="2">{tr}Active Icons{/tr}</th> {/if} - <th style="width:70%;">{tr}Icon name{/tr}</th> - <th style="width:29%;">{tr}bitweaver uses{/tr}</th> + <th class="width70p;">{tr}Icon name{/tr}</th> + <th class="width29p;">{tr}bitweaver uses{/tr}</th> </tr> {foreach from=$defaultIconList item=icon} diff --git a/templates/module_config_inc.tpl b/templates/module_config_inc.tpl index 1be783d..d2452f7 100644 --- a/templates/module_config_inc.tpl +++ b/templates/module_config_inc.tpl @@ -19,7 +19,7 @@ {strip} <h3> - {if !$smarty.request.nocollapse && !$condensed && $gBitThemes->isJavascriptEnabled()}<a href="javascript:flipWithSign('id-{$modInfo.module_id}');"><span id="flipperid-{$modInfo.module_id}" style="font-family:monospace">[+]</span> {/if} + {if !$smarty.request.nocollapse && !$condensed && $gBitThemes->isJavascriptEnabled()}<a href="javascript:flipWithSign('id-{$modInfo.module_id}');"><span id="flipperid-{$modInfo.module_id}" class="monospace">[+]</span> {/if} {$modInfo.name} <input type="hidden" name="modules[{$modInfo.module_id}][layout_area]" value="{$area}" /> <input type="hidden" name="modules[{$modInfo.module_id}][layout]" value="{$module_package}" /> @@ -32,7 +32,7 @@ {if !$smarty.request.nocollapse && $gBitThemes->isJavascriptEnabled()}<div id="id-{$modInfo.module_id}" style="display:none;">{/if} <table class="data"> <tr> - <td style="text-align:right">{tr}Position{/tr}</td> + <td class="alignright">{tr}Position{/tr}</td> <td> <input type="text" size="4" name="modules[{$modInfo.module_id}][pos]" value="{$modInfo.pos}" /> </td> @@ -40,26 +40,26 @@ {if !$gBitThemes->isCustomModule( $modInfo.module_rsrc )} <tr> - <td style="text-align:right">{tr}Title{/tr}</td> + <td class="alignright">{tr}Title{/tr}</td> <td><input type="text" size="15" name="modules[{$modInfo.module_id}][title]" value="{$modInfo.title|escape}" /></td> </tr> <tr> - <td style="text-align:right">{tr}Rows{/tr}</td> + <td class="alignright">{tr}Rows{/tr}</td> <td><input type="text" size="15" name="modules[{$modInfo.module_id}][module_rows]" value="{$modInfo.module_rows}" /></td> </tr> <tr> - <td style="text-align:right">{tr}Parameters{/tr}</td> + <td class="alignright">{tr}Parameters{/tr}</td> <td><input type="text" size="15" name="modules[{$modInfo.module_id}][params]" value="{$modInfo.params}" /></td> </tr> {/if} <tr> - <td style="text-align:right">{tr}Cache Time{/tr}</td> + <td class="alignright">{tr}Cache Time{/tr}</td> <td><input type="text" size="15" name="modules[{$modInfo.module_id}][cache_time]" value="{$modInfo.cache_time}" /></td> </tr> <tr> - <td style="text-align:right">{tr}Groups{/tr}</td> + <td class="alignright">{tr}Groups{/tr}</td> <td> <select multiple="multiple" size="3" name="modules[{$modInfo.module_id}][groups][]"> {foreach from=$groups key=groupId item=group} |