mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

inline style cleanup

Browse Source
This commit is contained in:
secretr
2008-12-16 11:05:36 +00:00
parent 373eb0d7b0
commit 3cfdf05b4a
4 changed files with 155 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_admin/header.php
View File

@@ -12,8 +12,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $ | $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $
| $Revision: 1.20 $ | $Revision: 1.21 $
| $Date: 2008-12-14 21:01:58 $ | $Date: 2008-12-16 11:05:36 $
| $Author: secretr $ | $Author: secretr $
+---------------------------------------------------------------+ +---------------------------------------------------------------+
*/ */
@@ -94,20 +94,20 @@ if (!defined('ADMIN_WIDTH')) {
if (!defined('ADMIN_TRUE_ICON')) if (!defined('ADMIN_TRUE_ICON'))
{ {
define("ADMIN_TRUE_ICON", "<img src='".e_IMAGE_ABS."fileinspector/integrity_pass.png' alt='' style='border:0px; height:16px; width:16px' />"); define("ADMIN_TRUE_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."fileinspector/integrity_pass.png' alt='' />");
define("ADMIN_TRUE_ICON_PATH", e_IMAGE."fileinspector/integrity_pass.png"); define("ADMIN_TRUE_ICON_PATH", e_IMAGE."fileinspector/integrity_pass.png");
} }
if (!defined('ADMIN_FALSE_ICON')) if (!defined('ADMIN_FALSE_ICON'))
{ {
define("ADMIN_FALSE_ICON", "<img src='".e_IMAGE_ABS."fileinspector/integrity_fail.png' alt='' style='border:0px; height:16px; width:16px' />"); define("ADMIN_FALSE_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."fileinspector/integrity_fail.png' alt='' />");
define("ADMIN_FALSE_ICON_PATH", e_IMAGE."fileinspector/integrity_fail.png"); define("ADMIN_FALSE_ICON_PATH", e_IMAGE."fileinspector/integrity_fail.png");
} }
if (!defined('ADMIN_EDIT_ICON')) if (!defined('ADMIN_EDIT_ICON'))
{ {
define("ADMIN_EDIT_ICON", "<img src='".e_IMAGE_ABS."admin_images/edit_16.png' alt='' title='".LAN_EDIT."' style='border:0px; height:16px; width:16px' />"); define("ADMIN_EDIT_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/edit_16.png' alt='' title='".LAN_EDIT."' />");
define("ADMIN_EDIT_ICON_PATH", e_IMAGE."admin_images/edit_16.png"); define("ADMIN_EDIT_ICON_PATH", e_IMAGE."admin_images/edit_16.png");
} }
@@ -115,7 +115,7 @@ if (!defined('ADMIN_EDIT_ICON'))
if (!defined('ADMIN_DELETE_ICON')) if (!defined('ADMIN_DELETE_ICON'))
{ {
define("ADMIN_DELETE_ICON", "<img src='".e_IMAGE_ABS."admin_images/delete_16.png' alt='' title='".LAN_DELETE."' style='border:0px; height:16px; width:16px' />"); define("ADMIN_DELETE_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/delete_16.png' alt='' title='".LAN_DELETE."' />");
define("ADMIN_DELETE_ICON_PATH", e_IMAGE."admin_images/delete_16.png"); define("ADMIN_DELETE_ICON_PATH", e_IMAGE."admin_images/delete_16.png");
} }

55
e107_admin/links.php
View File

@@ -9,8 +9,8 @@
* Administration Area - Site Links * Administration Area - Site Links
* *
* $Source: /cvs_backup/e107_0.8/e107_admin/links.php,v $ * $Source: /cvs_backup/e107_0.8/e107_admin/links.php,v $
* $Revision: 1.16 $ * $Revision: 1.17 $
* $Date: 2008-12-15 22:32:24 $ * $Date: 2008-12-16 11:05:36 $
* $Author: secretr $ * $Author: secretr $
* *
*/ */
@@ -371,7 +371,7 @@ class links
} }
else else
{ {
$text .= "<div style='text-align:center'>".LCLAN_61."</div>"; $text .= "<div class='center'>".LCLAN_61."</div>";
} }
$e107->ns->tablerender(LCLAN_8, $emessage->render().$text); $e107->ns->tablerender(LCLAN_8, $emessage->render().$text);
} }
@@ -436,7 +436,7 @@ class links
if($indent) if($indent)
{ {
$subimage = "<img src='".e_IMAGE."admin_images/sublink.png' alt='' />"; $subimage = "<img class='icon S16' src='".e_IMAGE_ABS."admin_images/sublink.png' alt='' />";
$subspacer = ($indent > 1) ? " style='padding-left: ".(($indent - 1) * 16)."px'" : ""; $subspacer = ($indent > 1) ? " style='padding-left: ".(($indent - 1) * 16)."px'" : "";
} }
@@ -444,7 +444,7 @@ class links
<tr> <tr>
<td title='".$link_description."'> <td title='".$link_description."'>
"; ";
$text .= $link_button ? "<img src='".e_IMAGE."icons/".$link_button."' alt='' /> " : ""; $text .= $link_button ? "<img class='icon S16' src='".e_IMAGE_ABS."icons/".$link_button."' alt='' /> " : "";
$text .= " $text .= "
</td> </td>
<td title='".$link_description."'".$subspacer."> <td title='".$link_description."'".$subspacer.">
@@ -453,9 +453,9 @@ class links
"; ";
$text .= " $text .= "
<td class='center'> <td class='center'>
<a href='".e_SELF."?create.sub.{$link_id}'><img src='".e_IMAGE."admin_images/sublink_16.png' title='".LINKLAN_10."' alt='".LINKLAN_10."' /></a>&nbsp; <a href='".e_SELF."?create.sub.{$link_id}'><img class='icon action S16' src='".e_IMAGE_ABS."admin_images/sublink_16.png' title='".LINKLAN_10."' alt='".LINKLAN_10."' /></a>&nbsp;
<a href='".e_SELF."?create.edit.{$link_id}'>".ADMIN_EDIT_ICON."</a>&nbsp; <a href='".e_SELF."?create.edit.{$link_id}'>".ADMIN_EDIT_ICON."</a>&nbsp;
<input class='actions delete' type='image' name='main_delete_{$link_id}' src='".ADMIN_DELETE_ICON_PATH."' title='".$tp->toJS(LCLAN_58." [ $link_name ]")."' /> <input class='action delete' type='image' name='main_delete_{$link_id}' src='".ADMIN_DELETE_ICON_PATH."' title='".$tp->toJS(LCLAN_58." [ $link_name ]")."' />
</td> </td>
<td>".r_userclass("link_class[".$link_id."]", $link_class, "off", "public,guest,nobody,member,admin,classes")."</td> <td>".r_userclass("link_class[".$link_id."]", $link_class, "off", "public,guest,nobody,member,admin,classes")."</td>
<td class='center'> <td class='center'>
@@ -487,7 +487,7 @@ class links
// Show the form for link create/edit // Show the form for link create/edit
function create_link($sub_action, $id) function create_link($sub_action, $id)
{ {
global $sql, $rs, $e107, $pst, $tp, $emessage; global $sql, $e107, $pst, $tp, $emessage;
$preset = $pst->read_preset("admin_links"); $preset = $pst->read_preset("admin_links");
extract($preset); extract($preset);
@@ -552,7 +552,7 @@ class links
<tr> <tr>
<td class='label'>".LCLAN_17.": </td> <td class='label'>".LCLAN_17.": </td>
<td class='control'> <td class='control'>
<textarea class='tbox textarea' id='link_description' name='link_description' cols='70' rows='5' style='width:95%' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this)'>".$tp->toForm($link_description)."</textarea> <textarea class='tbox textarea' id='link_description' name='link_description' cols='70' rows='5' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this)'>".$tp->toForm($link_description)."</textarea>
<br/>".display_help("helpb", "admin")." <br/>".display_help("helpb", "admin")."
</td> </td>
@@ -561,15 +561,33 @@ class links
<td class='label'>".LCLAN_18.": </td> <td class='label'>".LCLAN_18.": </td>
<td class='control'> <td class='control'>
<input class='tbox input-text' type='text' id='link_button' name='link_button' size='42' value='{$link_button}' maxlength='100' /> <input class='tbox input-text' type='text' id='link_button' name='link_button' size='42' value='{$link_button}' maxlength='100' />
<button class='submit' type='button' value='".LCLAN_39."' onclick='expandit(\"linkicn\")'><span>".LCLAN_39."</span></button> <button class='submit' type='button' value='".LCLAN_39."' onclick='e107Helper.toggle(\"linkicn\")'><span>".LCLAN_39."</span></button>
<div id='linkicn' style='display:none;{head}'> <div id='linkicn' class='e-hideme'>
<div class='expand-container'>
"; ";
//SecretR - more nice view
$tmp = array('_16', '_32', '_48', '_64', '_128');
$tmp1 = array();
foreach($iconlist as $icon) foreach($iconlist as $icon)
{ {
$filepath = str_replace(e_IMAGE."icons/", "", $icon['path'].$icon['fname']); $filepath = str_replace(e_IMAGE."icons/", "", $icon['path'].$icon['fname']);
$text .= "<a href=\"javascript:insertext('".$filepath."','link_button','linkicn')\"><img src='".$icon['path'].$icon['fname']."' alt='' /></a>"; $str = "<a href='#' onclick=\"e107Helper.insertText('".$filepath."','link_button','linkicn'); return false; \"><img class='icon list' src='".$icon['path'].$icon['fname']."' alt='' /></a>";
foreach ($tmp as $isize)
{
if(strpos($filepath, $isize) !== false)
{
$tmp1[$isize] = varset($tmp1[$isize]).$str;
continue 2;
} }
}
$tmp1['other'] = varset($tmp1['other']).$str;//other
}
$text .= $tmp1 ? '<div class="clear">'.implode('</div><div class="clear">', $tmp1).'</div>' : '';
unset($tmp, $tmp1);
//End view
// 1 = _blank // 1 = _blank
// 2 = _parent not in use. // 2 = _parent not in use.
@@ -582,6 +600,7 @@ class links
$text .= " $text .= "
</div> </div>
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
@@ -591,8 +610,8 @@ class links
"; ";
foreach($linkop as $key => $val) foreach($linkop as $key => $val)
{ {
$selectd = ($link_open == $key) ? "selected='selected'" : ""; $selectd = ($link_open == $key) ? " selected='selected'" : "";
$text .= "<option value='$key' $selectd>".$val."</option>\n"; $text .= "<option value='$key'{$selectd}>".$val."</option>\n";
} }
$text .= " $text .= "
@@ -607,8 +626,8 @@ class links
$rentype = array("", "Main", "Alt", "Alt", "Alt", "Alt", "Alt", "Alt", "Alt", "Alt", "Alt"); $rentype = array("", "Main", "Alt", "Alt", "Alt", "Alt", "Alt", "Alt", "Alt", "Alt", "Alt");
for($i = 1; $i < count($rentype); $i++) for($i = 1; $i < count($rentype); $i++)
{ {
$sel = ($link_category == $i) ? "selected='selected'" : ""; $sel = ($link_category == $i) ? " selected='selected'" : "";
$text .= "<option value='$i' $sel>$i - ".$rentype[$i]."</option>"; $text .= "<option value='$i'{$sel}>$i - ".$rentype[$i]."</option>";
} }
; ;
@@ -634,7 +653,7 @@ class links
{ {
$text .= " $text .= "
<button class='update' type='submit' name='add_link' value='".LCLAN_27."'><span>".LCLAN_27."</span></button> <button class='update' type='submit' name='add_link' value='".LCLAN_27."'><span>".LCLAN_27."</span></button>
<input type='hidden' name='link_id' value='$link_id' /> <input type='hidden' name='link_id' value='{$link_id}' />
"; ";
} else } else
{ {

8
e107_files/jslib/e107.js.php
View File

@@ -8,8 +8,8 @@
* e107 Javascript API * e107 Javascript API
* *
* $Source: /cvs_backup/e107_0.8/e107_files/jslib/e107.js.php,v $ * $Source: /cvs_backup/e107_0.8/e107_files/jslib/e107.js.php,v $
* $Revision: 1.14 $ * $Revision: 1.15 $
* $Date: 2008-12-10 16:59:19 $ * $Date: 2008-12-16 11:05:36 $
* $Author: secretr $ * $Author: secretr $
* *
*/ */
@@ -744,7 +744,7 @@ var e107Utils = {}
*/ */
var e107Helper = { var e107Helper = {
fxToggle: function(el, fx) { fxToggle: function(el, fx) {
var opt = Object.extend( { effect: 'blind' , options: {duration: 0.5} }, fx || {}) var opt = Object.extend( { effect: 'blind' , options: {duration: 0.5} }, fx || {});
Effect.toggle(el, opt.effect, opt.options); Effect.toggle(el, opt.effect, opt.options);
} }
} }
@@ -800,7 +800,7 @@ Object.extend(e107Helper, {
var fx = varset(arguments[1], null); var fx = varset(arguments[1], null);
if(null !== fx) if(false !== fx)
this.fxToggle(eltoggle, fx || {}); this.fxToggle(eltoggle, fx || {});
else else
$(eltoggle).toggle(); $(eltoggle).toggle();

26
e107_themes/_blank/admin_style.css
View File

@@ -20,12 +20,13 @@
.smalltext { font-size: 11px; } .smalltext { font-size: 11px; }
/* Core Icons */ /* Core Icons */
.icon { border: 0 } img.icon { border: 0 }
.icon.action { vertical-align: middle } img.icon.list { margin: 0px 5px 5px 0px }
.S16 { width: 16px; height: 16px } img.icon.action { vertical-align: middle }
.S32 { width: 32px; height: 32px } img.S16 { width: 16px; height: 16px }
.S64 { width: 64px; height: 64px } img.S32 { width: 32px; height: 32px }
.S128 { width: 128px; height: 128px } img.S64 { width: 64px; height: 64px }
img.S128 { width: 128px; height: 128px }
/*******************************************************************************************************************/ /*******************************************************************************************************************/
/* RESET CSS *********************************************************************************************/ /* RESET CSS *********************************************************************************************/
@@ -289,13 +290,14 @@ button.cancel:active span {}
.buttons-bar button { margin-right: 10px; } .buttons-bar button { margin-right: 10px; }
.buttons-bar button.f-right { margin-right: 0px; } .buttons-bar button.f-right { margin-right: 0px; }
/* Actions (adminlist ) */ /* Actions (adminlist) - input type image */
input.action {} /* default */ input.action { vertical-align: middle; } /* default */
input.delete {} input.action.delete {}
input.edit {} input.action.edit {}
/********** Misc */ /********** Misc */
.e-pointer { cursor: pointer; } .e-pointer { cursor: pointer; } /* Pointer Hand */
.expand-container { padding: 10px; } /* Block with expandable items */
/*******************************************************************************************************************/ /*******************************************************************************************************************/
@@ -307,7 +309,7 @@ input.edit {}
.admin-header-content { border: 1px solid #DDDDDD; } .admin-header-content { border: 1px solid #DDDDDD; }
.admin-page-body { padding: 20px 15px 0; } .admin-page-body { padding: 20px 15px 0; }
.admin-footer {} .admin-footer {}
legend { font-size: 16px; font-weight: bold; } legend { font-size: 16px; font-weight: bold; padding: 5px; }
/******** Layout */ /******** Layout */
.main-table { width: 100%; border: 0 none; } .main-table { width: 100%; border: 0 none; }