mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00
Code Issues Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
e107_admin/admin_log.php
View File

@ -235,8 +235,8 @@ if(($action == "confdel") || ($action == "auditdel"))
</table>
<div class='buttons-bar center'>
<input type='hidden' name='backdeltype' value='{$action}' />
<button class='delete' type='submit' name='confirmdeleteold' value='no-value'><span>".RL_LAN_049."</span></button>
<button class='cancel' type='submit' name='confirmcancelold' value='no-value'><span>".LAN_CANCEL."</span></button>
$frm->admin_button('confirmdeleteold', 'no-value', 'delete', RL_LAN_049);
$frm->admin_button('confirmcancelold', 'no-value', 'delete', LAN_CANCEL);
</div>
</fieldset>
</form>
@ -474,7 +474,7 @@ if($action == "config")
</tbody>
</table>
<div class='buttons-bar center'>
<button class='update' type='submit' name='setoptions' value='no-value'><span>".RL_LAN_010."</span></button>
".$frm->admin_button('setoptions', 'no-value', 'update', LAN_UPDATE)."
</div>
</fieldset>
</form>
@ -495,7 +495,7 @@ if($action == "config")
<tr>
<td>".RL_LAN_045." </td>
<td>
".gen_log_delete('rolllog_clearadmin').RL_LAN_046."<button class='delete no-confirm' type='submit' name='deleteoldadmin' value='no-value'><span>".RL_LAN_049."</span></button>
".gen_log_delete('rolllog_clearadmin').RL_LAN_046.$frm->admin_button('deleteoldadmin', 'no-value', 'delete', RL_LAN_049)."
</td>
</tr>
";
@ -506,7 +506,7 @@ if($action == "config")
<tr>
<td>".RL_LAN_066." </td>
<td>
".gen_log_delete('rolllog_clearaudit').RL_LAN_046."<button class='delete no-confirm' type='submit' name='deleteoldaudit' value='no-value'><span>".RL_LAN_049."</span></button>
".gen_log_delete('rolllog_clearaudit').RL_LAN_046.$frm->admin_button('deleteoldaudit', 'no-value', 'delete', RL_LAN_049)."
</td>
</tr>
</tbody>
@ -773,7 +773,7 @@ if(isset($page_title[$action]))
";
}
$text .= "
</select>".RL_LAN_093."
</select> ".RL_LAN_093."
</td>";
$filter_cols = 4;
break;
@ -856,8 +856,8 @@ if(isset($page_title[$action]))
$text .= "
</table>
<div class='buttons-bar center'>
<button class='delete no-confirm' type='submit' name='clearfilters' value='no-value'><span>".RL_LAN_114."</span></button>
<button class='update' type='submit' name='updatefilters' value='no-value'><span>".RL_LAN_028."</span></button>
".$frm->admin_button('clearfilters', 'no-value', 'delete', RL_LAN_114)."
".$frm->admin_button('updatefilters', 'no-value', 'update', RL_LAN_028)."
</div>
</fieldset>
</form>
@ -1013,13 +1013,11 @@ if(isset($page_title[$action]))
</tbody>
</table>
<div class='buttons-bar center'>
<button class='submit' type='submit' name='refreshlog' value='no-value'><span>".RL_LAN_018."</span></button>
".$frm->admin_button('refreshlog', 'no-value', 'submit', RL_LAN_018)."
";
if($delete_button)
{
$text .= "
<button class='delete' type='submit' name='deleteitems' value='no-value'><span>".RL_LAN_111."</span></button>
";
$text .= $frm->admin_button('deleteitems', 'no-value', 'delete', RL_LAN_11);
}
$text .= "
</div>

31
e107_admin/theme.php
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");

36
e107_handlers/theme_handler.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,20 +455,29 @@ 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()
{
$mes = e107::getMessage();
@ -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;

2
e107_languages/English/admin/lan_admin_log.php
View File

@ -11,7 +11,7 @@ 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_010', "Update Options");
// define('RL_LAN_011', 'Rolling Log Configuration');
define('RL_LAN_012', "Filter Options");
define('RL_LAN_013', "Start date/time");

5
e107_themes/bootstrap/admin_style.css
View File

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