mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 14:17:49 +02:00
Code Issues Releases Wiki Activity

A little more icon cleanup

Browse Source
This commit is contained in:
Cameron
2012-12-04 04:11:00 -08:00
parent 1c9e44a0e8
commit fc223feaf2
7 changed files with 130 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
e107_admin/includes/infopanel.php
View File

@@ -77,6 +77,8 @@ class adminstyle_infopanel
//TODO LANs throughout.
global $style;
// ---------------------- Start Panel --------------------------------
$text = "<div >";
@@ -123,30 +125,6 @@ class adminstyle_infopanel
// ------------------------------- e107 News --------------------------------
$panelRSS = "
";
// TODO Load with Ajax
/*
$xml = e107::getXml();
$vars = $xml->loadXMLfile('http://www.e107.org/e107_plugins/rss_menu/rss.php?1.2', true, true);
$text .= print_r($vars,TRUE);
*/
$panelRSS .= "
RSS News feed from e107.org goes here.
";
/*
</div>
</div>
</div>
*/
$text .= $ns->tablerender("e107 News","<div id='e-tweet'></div>","core-infopanel_news",true);
// ---------------------Latest Stuff ---------------------------

17
e107_handlers/form_handler.php
View File

@@ -1169,28 +1169,34 @@ class e_form
{
case 'edit':
$image = ADMIN_EDIT_ICON_PATH;
$icon = "e-edit-16";
$options['class'] = $options['class'] == 'action' ? 'action edit' : $options['class'];
break;
case 'delete':
$image = ADMIN_DELETE_ICON_PATH;
$icon = "e-delete-16";
$options['class'] = $options['class'] == 'action' ? 'action delete' : $options['class'];
$options['other'] = 'data-confirm="'.LAN_JSCONFIRM.'"';
break;
case 'execute':
$image = ADMIN_EXECUTE_ICON_PATH;
$icon = "e-execute-16";
$options['class'] = $options['class'] == 'action' ? 'action execute' : $options['class'];
break;
case 'view':
$image = ADMIN_VIEW_ICON_PATH;
$icon = "e-view-16";
$options['class'] = $options['class'] == 'action' ? 'action view' : $options['class'];
break;
}
$options['title'] = $title;//shorthand
return "<input class='e-tip' data-placement='left' type='image' src='{$image}' name='{$name}' value='{$value}'".$this->get_attributes($options, $name, $value)." />";
// return "<button type='submit' name='{$name}' data-placement='left' value='{$value}'".$this->get_attributes($options, $name, $value)." ><i class='S16 {$icon}'></i></button>";
return "<input class='e-tip S16 {$icon}' data-placement='left' type='image' src='{$image}' name='{$name}' value='{$value}'".$this->get_attributes($options, $name, $value)." />";
}
/**
@@ -1841,6 +1847,15 @@ class e_form
$value .= "<a href='".e_SELF."?{$query}' class='e-tip' title='".LAN_EDIT."' data-placement='left'>
<img class='icon action edit list' src='".ADMIN_EDIT_ICON_PATH."' alt='".LAN_EDIT."' /></a>";
/*
$value .= "<a href='".e_SELF."?{$query}' class='btn e-tip' title='".LAN_EDIT."' data-placement='left'>
".ADMIN_EDIT_ICON."
</a>";
*/
$delcls = vartrue($attributes['noConfirm']) ? ' no-confirm' : '';
if(varset($parms['deleteClass']))
{

3
e107_plugins/download/e_help.php
View File

@@ -60,6 +60,7 @@ switch($action) {
break;
}
default : {
/*
$text = "<p>Please upload your files into the ".e_DOWNLOAD." folder, your images into the ".e_FILE."downloadimages folder and thumbnail images into the ".e_FILE."downloadthumbs folder.</p>
<p>To submit a download, first create a parent, then create a category under that parent, you will then be able to make the download available.</p>";
$text .= "<div>";
@@ -68,6 +69,8 @@ switch($action) {
$text .= " <img src='".ADMIN_WARNING_ICON_PATH."' title='".DOWLAN_124."' alt='' style='cursor:help'/> ".DOWLAN_124."<br/>";
$text .= " <img src='".ADMIN_FALSE_ICON_PATH."' title='".DOWLAN_122."' alt='' style='cursor:help'/> ".DOWLAN_122."<br/>";
$text .= "</div>";
*/
}
}
$ns -> tablerender(DOWLAN_HELP_1, $text);

4
e107_plugins/download/handlers/adminDownload_class.php
View File

@@ -363,7 +363,7 @@ class adminDownload extends download
}
elseif ($row[$disp]== 2)
{
$text .= "<img src='".ADMIN_WARNING_ICON_PATH."' title='".DOWLAN_124."' alt='' style='cursor:help'/>";
$text .= "<img src='".ADMIN_WAR/NING_ICON_PATH."' title='".DOWLAN_124."' alt='' style='cursor:help'/>";
}
else
{
@@ -379,7 +379,7 @@ class adminDownload extends download
$mirrorArray = $this->makeMirrorArray($row[$disp], TRUE);
foreach($mirrorArray as $mirror) {
$title = DOWLAN_66." ".$mirror['filesize']."; ".DOWLAN_29." ".$mirror['requests'];
$text .= "<div><img src='".ADMIN_INFO_ICON_PATH."' title='".$title."' alt='' style='cursor:help'/> ";
$text .= "<div><img src='".ADMIN_INFO_IC/ON_PATH."' title='".$title."' alt='' style='cursor:help'/> ";
$text .= $tp->toHTML($mirror['url']).'</div>';
}
break;

57
e107_plugins/log/e_meta.php
View File

@@ -14,6 +14,7 @@
*/
if (!defined('e107_INIT')) { exit; }
if (isset($pref['statActivate']) && $pref['statActivate'])
{
if(!$pref['statCountAdmin'] && ADMIN)
@@ -57,9 +58,63 @@ var logString = 'referer=' + ref + '&colour=' + colord + '&eself=' + eself + '&r
logString = rstr2b64(logString);
document.write('<link rel=\"stylesheet\" type=\"text/css\" href=\"".e_PLUGIN_ABS."log/log.php?lv='+logString + '\">' );
";
$logJS = "
$(function() {
function rstr2b64(input)
{
var b64pad = \"=\"; /* base-64 pad character. \"=\" for strict RFC compliance */
var tab = \"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/\";
var output = \"\";
var len = input.length;
for(var i = 0; i < len; i += 3)
{
var triplet = (input.charCodeAt(i) << 16)
| (i + 1 < len ? input.charCodeAt(i+1) << 8 : 0)
| (i + 2 < len ? input.charCodeAt(i+2) : 0);
for(var j = 0; j < 4; j++)
{
if(i * 8 + j * 6 > input.length * 8) output += b64pad;
else output += tab.charAt((triplet >>> 6*(3-j)) & 0x3F);
}
}
return output;
}
var ref =\"\"+escape(top.document.referrer);
var colord = window.screen.colorDepth;
var res = window.screen.width + \"x\" + window.screen.height;
var logString = 'referer=' + ref + '&colour=' + colord + '&eself=' + eself + '&res=' + res + '".$err_flag."';
logString = rstr2b64(logString);
var url = '".e_PLUGIN_ABS."log/log.php';
var dataText = 'lv='+logString;
$.ajax({
type: 'get',
url: url,
data: {'lv' :logString},
success: function() {
alert(logString);
}
});
});
";
if(USER_AREA)
{
$e107 = e107::getInstance();
$e107->getJs()->headerInline($logJS, 5);
}
}

2
e107_plugins/log/log.php
View File

@@ -25,7 +25,7 @@
// Normally the file is 'silent' - if any errors occur, not sure where they'll appear - (file type now text/html instead of text/css)
*/
error_reporting(0);
//error_reporting(0);
define('log_INIT', TRUE);
// Array of page names which should have individual query values recorded.

74
e107_themes/templates/admin_icons_template.php
View File

@@ -68,54 +68,54 @@
*/
//XXX Do NOT use 'title' attributes - these should go in the <a>
define("ADMIN_TRUE_ICON", "<i class='S16 e-true-16'></i>");
define("ADMIN_TRUE_ICON_PATH", e_IMAGE_ABS."admin_images/true_16.png");
define("ADMIN_FALSE_ICON", "<i class='S16 e-false-16'></i>");
define("ADMIN_FALSE_ICON_PATH", e_IMAGE_ABS."admin_images/false_16.png");
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_ABS."admin_images/edit_16.png");
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_ABS."admin_images/delete_16.png");
define("ADMIN_UP_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/up_16.png' alt='' title='".LAN_DELETE."' />");
define("ADMIN_UP_ICON_PATH", e_IMAGE_ABS."admin_images/up_16.png");
define("ADMIN_DOWN_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/down_16.png' alt='' title='".LAN_DELETE."' />");
define("ADMIN_DOWN_ICON_PATH", e_IMAGE_ABS."admin_images/down_16.png");
define("ADMIN_EDIT_ICON", "<i class='S16 e-edit-16' ></i>");
define("ADMIN_DELETE_ICON", "<i class='S16 e-delete-16'></i>");
define("ADMIN_UP_ICON", "<i class='S16 e-up-16'></i>");
define("ADMIN_DOWN_ICON", "<i class='S16 e-down-16'></i>");
define("ADMIN_WARNING_ICON", "<i class='S16 e-warning-16'></i>");
define("ADMIN_WARNING_ICON_PATH", e_IMAGE_ABS."admin_images/warning_16.png");
define("ADMIN_INFO_ICON", "<i class='S16 e-info-16'></i>");
define("ADMIN_INFO_ICON_PATH", e_IMAGE_ABS."admin_images/info_16.png");
define("ADMIN_CONFIGURE_ICON", "<i class='S16 e-configure-16'></i>");
define("ADMIN_CONFIGURE_ICON_PATH", e_IMAGE_ABS."admin_images/configure_16.png");
define("ADMIN_ADD_ICON", "<i class='S16 e-add-16'></i>");
define("ADMIN_ADD_ICON_PATH", e_IMAGE_ABS."admin_images/add_16.png");
define("ADMIN_VIEW_ICON", "<i class='S16 e-search-16'></i>");
define("ADMIN_VIEW_ICON_PATH", e_IMAGE_ABS."admin_images/admin_images/search_16.png");
define("ADMIN_URL_ICON", "<i class='S16 e-forums-16'></i>");
define("ADMIN_URL_ICON_PATH", e_IMAGE_ABS."admin_images/forums_16.png");
define("ADMIN_INSTALLPLUGIN_ICON", "<i class='S16 e-plugin_install-16'></i>");
define("ADMIN_INSTALLPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/plugin_install_16.png");
define("ADMIN_UNINSTALLPLUGIN_ICON","<i class='S16 e-plugin_uninstall-16'></i>");
define("ADMIN_UNINSTALLPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/plugin_unstall_16.png");
define("ADMIN_UPGRADEPLUGIN_ICON", "<i class='S16 e-up-16'></i>");
define("ADMIN_UPGRADEPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/up_16.png");
define("ADMIN_EXECUTE_ICON", "<i class='S16 e-execute-16'></i>");
define("ADMIN_SORT_ICON", "<i class='S16 e-sort'></i>");
define("ADMIN_EXECUTE_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/execute_16.png' alt='' title='Run' />");//TODO LAN
define("ADMIN_EXECUTE_ICON_PATH", e_IMAGE."admin_images/execute_16.png");
define("ADMIN_SORT_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/sort_16.png' alt='' title='Sort' />"); //TODO LAN
define("ADMIN_SORT_ICON_PATH", e_IMAGE."admin_images/sort_16.png");
define("ADMIN_TRUE_ICON_PATH", e_IMAGE_ABS."admin_images/true_16.png"); //XXX DEPRECATED but used in v1.x
define("ADMIN_FALSE_ICON_PATH", e_IMAGE_ABS."admin_images/false_16.png"); //XXX DEPRECATED but used in v1.x
define("ADMIN_EDIT_ICON_PATH", e_IMAGE_ABS."admin_images/edit_16.png"); //XXX DEPRECATED but used in v1.x
define("ADMIN_DELETE_ICON_PATH", e_IMAGE_ABS."admin_images/delete_16.png"); //XXX DEPRECATED but used in v1.x
define("ADMIN_WARNING_ICON_PATH", e_IMAGE_ABS."admin_images/warning_16.png"); //XXX DEPRECATED but used in v1.x
// define("ADMIN_UP_ICON_PATH", e_IMAGE_ABS."admin_images/up_16.png"); //XXX DEPRECATED
// define("ADMIN_DOWN_ICON_PATH", e_IMAGE_ABS."admin_images/down_16.png"); //XXX DEPRECATED
// define("ADMIN_INFO_ICON_PATH", e_IMAGE_ABS."admin_images/info_16.png"); //XXX DEPRECATED
// define("ADMIN_CONFIGURE_ICON_PATH", e_IMAGE_ABS."admin_images/configure_16.png"); //XXX DEPRECATED
// define("ADMIN_ADD_ICON_PATH", e_IMAGE_ABS."admin_images/add_16.png"); //XXX DEPRECATED
// define("ADMIN_VIEW_ICON_PATH", e_IMAGE_ABS."admin_images/admin_images/search_16.png"); //XXX DEPRECATED
// define("ADMIN_URL_ICON_PATH", e_IMAGE_ABS."admin_images/forums_16.png"); //XXX DEPRECATED
// define("ADMIN_INSTALLPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/plugin_install_16.png"); //XXX DEPRECATED
// define("ADMIN_UNINSTALLPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/plugin_unstall_16.png"); //XXX DEPRECATED
// define("ADMIN_UPGRADEPLUGIN_ICON_PATH", e_IMAGE_ABS."admin_images/up_16.png"); //XXX DEPRECATED
// define("ADMIN_EXECUTE_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/execute_16.png' alt='' title='Run' />");
// define("ADMIN_EXECUTE_ICON_PATH", e_IMAGE."admin_images/execute_16.png"); //XXX DEPRECATED
// define("ADMIN_SORT_ICON", "<img class='icon action S16' src='".e_IMAGE_ABS."admin_images/sort_16.png' alt='' title='Sort' />");