1
0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 12:48:24 +01:00

Merge branch 'master' of github.com:e107inc/e107

This commit is contained in:
SecretR 2012-11-28 15:12:00 +02:00
commit c77518ce40
5 changed files with 1301 additions and 1249 deletions

File diff suppressed because it is too large Load Diff

View File

@ -51,11 +51,37 @@ e107::css("inline","
.admin-theme-cell { width:202px; height:160px; -moz-border-radius: 5px; border-radius: 5px; }
");
require_once("auth.php");
require_once(e_HANDLER."theme_handler.php");
$themec = new themeHandler;
if(e_AJAX_REQUEST)
{
$data = $themec->getThemeInfo('jayya');
echo $themec->renderThemeInfo($data);
exit;
}
echo '
<div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>Theme Info.</h3>
</div>
<div class="modal-body">
<p>Loading…</p>
</div>
<div class="modal-footer">
<a href="#" data-dismiss="modal" class="btn btn-primary">Close</a>
</div>
</div>';
require_once("auth.php");
$mode = (e_QUERY) ? e_QUERY :"main" ;
if($_POST['selectadmin'])
@ -74,6 +100,9 @@ if($_POST['selectmain'] || varset($_POST['setUploadTheme']))
}
$themec -> showThemes($mode);
// <a data-toggle="modal" href="'.e_SELF.'" data-target="#myModal" class="btn" >Launch demo modal</a>
require_once("footer.php");

View File

@ -61,6 +61,8 @@ class themeHandler
$mes = e107::getMessage();
require_once (e_HANDLER."form_handler.php");
//enable inner tabindex counter
$this->frm = new e_form();
@ -453,19 +455,28 @@ class themeHandler
// Show All Themes
if($mode == "choose")
{
$text = "";
// $text = "";
foreach ($this->themeArray as $key=>$theme)
{
$text .= $this->renderTheme(FALSE, $theme);
}
$text .= "<div class='clear'>&nbsp;</div>";
$ns->tablerender(TPVLAN_26." :: ".TPVLAN_39, $mes->render().$text);
}
echo "</form>\n</div>\n";
}
function renderUploadForm()
{
@ -528,7 +539,7 @@ class themeHandler
$preview = "<a href='".e_BASE."news.php?themepreview.".$theme['id']."' title='".TPVLAN_9."' >".($theme['preview'] ? "<img src='".$theme['preview']."' style='border: 1px solid #000;width:200px' alt='' />" : "<img src='".e_IMAGE_ABS."admin_images/nopreview.png' title='".TPVLAN_12."' alt='' />")."</a>";
$text = "<div style='font-weight:bold;margin-bottom:10px'>".TPVLAN_7."</div>
$text = "<div style='font-weight:bold;margin-bottom:10px'>".TPVLAN_7."</div>
<table class='table adminlist'>";
$text .= $author ? "<tr><td style='vertical-align:top; width:24%'><b>".TPVLAN_4."</b>:</td><td style='vertical-align:top'>".$author."</td></tr>" : "";
$text .= $website ? "<tr><td style='vertical-align:top; width:24%'><b>".TPVLAN_5."</b>:</td><td style='vertical-align:top'>".$website."</td></tr>" : "";
@ -595,7 +606,7 @@ class themeHandler
$text .= "</td></tr>";
$text .= $itext."</table>";
$text .= "<div class='right'><a href='#themeInfo_".$theme['id']."' class='e-expandit'>Close</a></div>";
// $text .= "<div class='right'><a href='#themeInfo_".$theme['id']."' class='e-expandit'>Close</a></div>";
return $text;
}
@ -676,10 +687,19 @@ class themeHandler
$previewbutton = (!$mode ? "<input class='button top' type='submit' name='preview_".$theme['id']."' value='".TPVLAN_9."' /> " : "");
$main_icon = ($pref['sitetheme'] != $theme['path']) ? "<input class='top e-tip' type='image' src='".e_IMAGE_ABS."admin_images/main_32.png' name='selectmain[".$theme['id']."]' alt='' title=\"".TPVLAN_10."\" />" : "<img src='".ADMIN_TRUE_ICON_PATH."' alt='' title='' class='icon S32' />";
$info_icon = "<a href='#themeInfo_".$theme['id']."' class='e-modal e-tip' title='".TPVLAN_7."'><img src='".e_IMAGE_ABS."admin_images/info_32.png' alt='' class='icon S32' /></a>";
$preview_icon = "<input class='top e-tip' type='image' src='".e_IMAGE_ABS."admin_images/search_32.png' name=\"preview[".$theme['id']."]\" title='".TPVLAN_9." #".$theme['id']."' />";
$admin_icon = ($pref['admintheme'] != $theme['path']) ? "<input class='top e-tip' type='image' src='".e_IMAGE_ABS."e107_icon_32.png' name='selectadmin[".$theme['id']."]' alt='' title=\"".TPVLAN_32."\" />\n" : "<img src='".ADMIN_TRUE_ICON_PATH."' alt='' title='' class='icon S32' />";
$main_icon = ($pref['sitetheme'] != $theme['path']) ? "<input class='top e-tip' type='image' src='".e_IMAGE_ABS."admin_images/main_32.png' name='selectmain[".$theme['id']."]' alt=\"".TPVLAN_10."\" title=\"".TPVLAN_10."\" />" : "<img src='".ADMIN_TRUE_ICON_PATH."' alt='' title='' class='icon S32' />";
// $info_icon = "<a data-toggle='modal' data-target='".e_SELF."' href='#themeInfo_".$theme['id']."' class='e-tip' title='".TPVLAN_7."'><img src='".e_IMAGE_ABS."admin_images/info_32.png' alt='' class='icon S32' /></a>";
$info_icon = "<a data-toggle='modal' href='".e_SELF."' data-target='#myModal' class='e-tip' title='".TPVLAN_7."'><img src='".e_IMAGE_ABS."admin_images/info_32.png' alt='info' class='icon S32' /></a>";
$preview_icon = "<input class='middle e-tip e-modal-iframe' href='".e_BASE."index.php?themepreview.".$theme['id']."' type='image' src='".e_IMAGE_ABS."admin_images/search_32.png' name=\"preview[".$theme['id']."]\" title='".TPVLAN_9." #".$theme['id']."' />";
// $preview_icon = "<a class='middle' title='".TPVLAN_9." #".$theme['id']."' data-toggle='modal' data-target='#myModal' href='".e_BASE."index.php?themepreview.".$theme['id']."'><img src='".e_IMAGE_ABS."admin_images/search_32.png' alt='Preview' /></a>";
// $preview_icon = "<a data-toggle='modal' href='".e_BASE."index.php?themepreview.".$theme['id']."' data-target='#myModal' >".($theme['preview'] ? "<img src='".$theme['preview']."' style='border: 1px solid #000;width:200px' alt='' />" : "<img src='".e_IMAGE_ABS."admin_images/nopreview.png' title='".TPVLAN_12."' alt='' />")."</a>";
$admin_icon = ($pref['admintheme'] != $theme['path']) ? "<input class='top e-tip' type='image' src='".e_IMAGE_ABS."e107_icon_32.png' name='selectadmin[".$theme['id']."]' alt=\"".TPVLAN_32."\" title=\"".TPVLAN_32."\" />\n" : "<img src='".ADMIN_TRUE_ICON_PATH."' alt='' title='' class='icon S32' />";
$newpreview = "<a href='".e_BASE."news.php?themepreview.".$theme['id']."' title='".TPVLAN_9."' >".($theme['preview'] ? "<img class='admin-theme-thumb' src='".$theme['preview']."' style='width:200px; height:160px;' alt='' />" : "<img class='admin-theme-thumb' src='".e_IMAGE_ABS."admin_images/nopreview.png' style='width:200px;height:160px;' title='".TPVLAN_12."' alt='' />")."</a>";
@ -695,7 +715,7 @@ class themeHandler
$text .= "<div class='admin-theme-title'>".$theme['name']." ".$theme['version']."</div>";
// $text .= "<div class='f-right right' style='width:45%;height:16px'>\n\n\n".$main_icon.$admin_icon.$info_icon.$preview_icon."\n\n</div>";
$text .= "<div id='themeInfo_".$theme['id']."' class='e-hideme col-selection' style='background-color:white;position:relative;top:-130px;width:480px'>\n".$this->renderThemeInfo($theme)."</div>\n";
// $text .= "<div id='themeInfo_".$theme['id']."' class='e-hideme col-selection' style='background-color:white;position:relative;top:-130px;width:480px'>\n".$this->renderThemeInfo($theme)."</div>\n";
$text .= "</div>";
return $text;

View File

@ -1,121 +1,121 @@
<?php
// e107 Language File.
// $Id$
//define('RL_LAN_001', 'System Logs');
define('RL_LAN_002', "Rolling Log");
// define('RL_LAN_003', 'User Audit Trail Maintenance');
//define('RL_LAN_004', "Admin/Rolling Log Upgraded");
define('RL_LAN_005', "Configure/View system logs");
define('RL_LAN_006', "Options Updated");
// define('RL_LAN_007', "User Audit Trail Options");
define('RL_LAN_008', "Rolling Log is active:");
define('RL_LAN_009', "Rolling Log History length in days");
define('RL_LAN_010', "Update Options");
// define('RL_LAN_011', 'Rolling Log Configuration');
define('RL_LAN_012', "Filter Options");
define('RL_LAN_013', "Start date/time");
define('RL_LAN_014', "End date/time");
define('RL_LAN_015', "User ID filter");
define('RL_LAN_016', "Blank for none, zero for guest");
define('RL_LAN_017', "No log entries, or none match filter");
define('RL_LAN_018', "Refresh log");
define('RL_LAN_019', "yy-mm-dd hh:mm:ss");
define('RL_LAN_020', "IP");
define('RL_LAN_021', "ID");
define('RL_LAN_022', "User");
define('RL_LAN_023', "Event Type");
define('RL_LAN_024', "From");
define('RL_LAN_025', "Event Title");
define('RL_LAN_026', "Class for which user actions logged");
// define('RL_LAN_027', "Options");
define('RL_LAN_028', "Update Filters");
define('RL_LAN_029', "Event type filter");
define('RL_LAN_030', "Admin Log");
define('RL_LAN_031', "Actions to log");
define('RL_LAN_032', "Pri"); // Event importance
define('RL_LAN_033', "Further Information");
define('RL_LAN_044', "Log events to display per page");
define('RL_LAN_045', "Delete admin log events older than ");
define('RL_LAN_046', " days");
define('RL_LAN_047', "Confirm delete admin log events older than ");
// define('RL_LAN_048', "Admin log maintenance");
define('RL_LAN_049', "Delete old entries");
define('RL_LAN_050', "Parameter error - nothing deleted");
// define('RL_LAN_051', "Confirm Delete");
define('RL_LAN_052', "Admin log");
define('RL_LAN_053', "User Audit Log");
define('RL_LAN_054', "Nothing to delete, or database error");
// define('RL_LAN_055', "Cancel");
define('RL_LAN_056', "Nothing deleted");
define('RL_LAN_057', " - events older than --OLD-- (--NUM-- entries) deleted");
define('RL_LAN_058', "Priority Filter:");
define('RL_LAN_059', "Caller Filter:");
define('RL_LAN_060', "IP Address Filter:");
define('RL_LAN_061', "Wildcard (*) at end acceptable");
define('RL_LAN_062', 'User Audit Log');
// define('RL_LAN_063', 'User audit settings updated');
define('RL_LAN_064', 'Applicable to all logs');
define('RL_LAN_065', "Confirm delete user audit log events older than ");
define('RL_LAN_066', "Delete user audit trail log events older than ");
define('RL_LAN_067', 'Download History');
define('RL_LAN_068', 'D/L ID');
define('RL_LAN_069', 'Download Name');
// Messages for checkbox options in audit log - correspond to audit log event codes (20 consecutive values reserved)
define('RL_LAN_071', 'User registration (ignores class setting above)');
define('RL_LAN_072', 'Signup email acknowledgement (ignores class setting above)');
define('RL_LAN_073', 'Login/Logout');
define('RL_LAN_075', 'Change display name');
define('RL_LAN_076', 'Change password');
define('RL_LAN_077', 'Change email address');
define('RL_LAN_078', 'Password Reset');
define('RL_LAN_079', 'Change other user settings');
define('RL_LAN_080', 'Admin quick add user');
define('RL_LAN_081', 'Mail bounces');
define('RL_LAN_082', 'User bans');
define('RL_LAN_083', 'Mail bounce resets');
define('RL_LAN_084', 'Temporary accounts');
// Intentional gap
define('RL_LAN_090', 'Download ID');
define('RL_LAN_091', 'Detailed timings');
define('RL_LAN_092', 'Time period');
define('RL_LAN_093', '(mins)');
define('RL_LAN_094', 'Detailed timing analysis');
// define('RL_LAN_095', 'Logs to include');
define('RL_LAN_096', 'Diff (s)');
// define('RL_LAN_097', 'Time');
define('RL_LAN_098', 'Source');
define('RL_LAN_099', 'Comments');
define('RL_LAN_100', 'CID'); // Comment ID field
define('RL_LAN_101', 'PID');
define('RL_LAN_102', 'ID');
define('RL_LAN_103', 'Subject');
define('RL_LAN_104', 'UID');
// define('RL_LAN_105', 'Author');
define('RL_LAN_106', 'Type');
define('RL_LAN_107', 'Comment');
define('RL_LAN_108', 'BK'); // Comment blocked
define('RL_LAN_109', 'LK'); // Comment locked
define('RL_LAN_110', 'Del'); // Delete column
define('RL_LAN_111', 'Delete checked items');
define('RL_LAN_112', 'Deleted --NUMBER-- comments');
define('RL_LAN_113', 'Error deleting comments!');
define('RL_LAN_114', 'Clear Filters');
define('RL_LAN_115', 'Users Admin');
define('RL_LAN_116', 'Location');
define('RL_LAN_117', 'PgCnt');
define('RL_LAN_118', 'Flag');
// define('RL_LAN_119', 'Active');
define('RL_LAN_120', 'Users on-line');
define('RL_LAN_121', 'System Logs Options');
define('RL_LAN_122', 'System Logs Configuration');
define('RL_LAN_123', 'User audit trail class');
define('RL_LAN_124', 'User audit trail actions');
define('RL_LAN_125', 'System Logs Maintenance');
define('RL_LAN_126', 'Total <strong>%d</strong> entries matching search condition');
// define('RL_LAN_JS_CONFIRM', 'Are you sure?');
<?php
// e107 Language File.
// $Id$
//define('RL_LAN_001', 'System Logs');
define('RL_LAN_002', "Rolling Log");
// define('RL_LAN_003', 'User Audit Trail Maintenance');
//define('RL_LAN_004', "Admin/Rolling Log Upgraded");
define('RL_LAN_005', "Configure/View system logs");
define('RL_LAN_006', "Options Updated");
// define('RL_LAN_007', "User Audit Trail Options");
define('RL_LAN_008', "Rolling Log is active:");
define('RL_LAN_009', "Rolling Log History length in days");
// define('RL_LAN_010', "Update Options");
// define('RL_LAN_011', 'Rolling Log Configuration');
define('RL_LAN_012', "Filter Options");
define('RL_LAN_013', "Start date/time");
define('RL_LAN_014', "End date/time");
define('RL_LAN_015', "User ID filter");
define('RL_LAN_016', "Blank for none, zero for guest");
define('RL_LAN_017', "No log entries, or none match filter");
define('RL_LAN_018', "Refresh log");
define('RL_LAN_019', "yy-mm-dd hh:mm:ss");
define('RL_LAN_020', "IP");
define('RL_LAN_021', "ID");
define('RL_LAN_022', "User");
define('RL_LAN_023', "Event Type");
define('RL_LAN_024', "From");
define('RL_LAN_025', "Event Title");
define('RL_LAN_026', "Class for which user actions logged");
// define('RL_LAN_027', "Options");
define('RL_LAN_028', "Update Filters");
define('RL_LAN_029', "Event type filter");
define('RL_LAN_030', "Admin Log");
define('RL_LAN_031', "Actions to log");
define('RL_LAN_032', "Pri"); // Event importance
define('RL_LAN_033', "Further Information");
define('RL_LAN_044', "Log events to display per page");
define('RL_LAN_045', "Delete admin log events older than ");
define('RL_LAN_046', " days");
define('RL_LAN_047', "Confirm delete admin log events older than ");
// define('RL_LAN_048', "Admin log maintenance");
define('RL_LAN_049', "Delete old entries");
define('RL_LAN_050', "Parameter error - nothing deleted");
// define('RL_LAN_051', "Confirm Delete");
define('RL_LAN_052', "Admin log");
define('RL_LAN_053', "User Audit Log");
define('RL_LAN_054', "Nothing to delete, or database error");
// define('RL_LAN_055', "Cancel");
define('RL_LAN_056', "Nothing deleted");
define('RL_LAN_057', " - events older than --OLD-- (--NUM-- entries) deleted");
define('RL_LAN_058', "Priority Filter:");
define('RL_LAN_059', "Caller Filter:");
define('RL_LAN_060', "IP Address Filter:");
define('RL_LAN_061', "Wildcard (*) at end acceptable");
define('RL_LAN_062', 'User Audit Log');
// define('RL_LAN_063', 'User audit settings updated');
define('RL_LAN_064', 'Applicable to all logs');
define('RL_LAN_065', "Confirm delete user audit log events older than ");
define('RL_LAN_066', "Delete user audit trail log events older than ");
define('RL_LAN_067', 'Download History');
define('RL_LAN_068', 'D/L ID');
define('RL_LAN_069', 'Download Name');
// Messages for checkbox options in audit log - correspond to audit log event codes (20 consecutive values reserved)
define('RL_LAN_071', 'User registration (ignores class setting above)');
define('RL_LAN_072', 'Signup email acknowledgement (ignores class setting above)');
define('RL_LAN_073', 'Login/Logout');
define('RL_LAN_075', 'Change display name');
define('RL_LAN_076', 'Change password');
define('RL_LAN_077', 'Change email address');
define('RL_LAN_078', 'Password Reset');
define('RL_LAN_079', 'Change other user settings');
define('RL_LAN_080', 'Admin quick add user');
define('RL_LAN_081', 'Mail bounces');
define('RL_LAN_082', 'User bans');
define('RL_LAN_083', 'Mail bounce resets');
define('RL_LAN_084', 'Temporary accounts');
// Intentional gap
define('RL_LAN_090', 'Download ID');
define('RL_LAN_091', 'Detailed timings');
define('RL_LAN_092', 'Time period');
define('RL_LAN_093', '(mins)');
define('RL_LAN_094', 'Detailed timing analysis');
// define('RL_LAN_095', 'Logs to include');
define('RL_LAN_096', 'Diff (s)');
// define('RL_LAN_097', 'Time');
define('RL_LAN_098', 'Source');
define('RL_LAN_099', 'Comments');
define('RL_LAN_100', 'CID'); // Comment ID field
define('RL_LAN_101', 'PID');
define('RL_LAN_102', 'ID');
define('RL_LAN_103', 'Subject');
define('RL_LAN_104', 'UID');
// define('RL_LAN_105', 'Author');
define('RL_LAN_106', 'Type');
define('RL_LAN_107', 'Comment');
define('RL_LAN_108', 'BK'); // Comment blocked
define('RL_LAN_109', 'LK'); // Comment locked
define('RL_LAN_110', 'Del'); // Delete column
define('RL_LAN_111', 'Delete checked items');
define('RL_LAN_112', 'Deleted --NUMBER-- comments');
define('RL_LAN_113', 'Error deleting comments!');
define('RL_LAN_114', 'Clear Filters');
define('RL_LAN_115', 'Users Admin');
define('RL_LAN_116', 'Location');
define('RL_LAN_117', 'PgCnt');
define('RL_LAN_118', 'Flag');
// define('RL_LAN_119', 'Active');
define('RL_LAN_120', 'Users on-line');
define('RL_LAN_121', 'System Logs Options');
define('RL_LAN_122', 'System Logs Configuration');
define('RL_LAN_123', 'User audit trail class');
define('RL_LAN_124', 'User audit trail actions');
define('RL_LAN_125', 'System Logs Maintenance');
define('RL_LAN_126', 'Total <strong>%d</strong> entries matching search condition');
// define('RL_LAN_JS_CONFIRM', 'Are you sure?');
?>

View File

@ -47,6 +47,11 @@ a.brand:hover img {
.sidebar-nav { font-size:12px; }
}
.modal {
min-width:800px;
}
@media (min-width: 1500px) {