From 8d8883b52c7a863df4d5c4a99e366da416d9b9ae Mon Sep 17 00:00:00 2001 From: Cameron Date: Wed, 28 Nov 2012 04:32:05 -0800 Subject: [PATCH] Theme handler fixes. --- e107_admin/theme.php | 31 ++++++++++++++++++++++- e107_handlers/theme_handler.php | 36 +++++++++++++++++++++------ e107_themes/bootstrap/admin_style.css | 5 ++++ 3 files changed, 63 insertions(+), 9 deletions(-) diff --git a/e107_admin/theme.php b/e107_admin/theme.php index 34cc20112..26f80d419 100644 --- a/e107_admin/theme.php +++ b/e107_admin/theme.php @@ -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 ' + + '; + +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); +// Launch demo modal + + require_once("footer.php"); diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php index 36843a63e..c0738b9ef 100644 --- a/e107_handlers/theme_handler.php +++ b/e107_handlers/theme_handler.php @@ -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 .= "
 
"; $ns->tablerender(TPVLAN_26." :: ".TPVLAN_39, $mes->render().$text); + + } echo "\n\n"; + + } + + + function renderUploadForm() { @@ -528,7 +539,7 @@ class themeHandler $preview = "".($theme['preview'] ? "" : "").""; - $text = "
".TPVLAN_7."
+ $text = "
".TPVLAN_7."
"; $text .= $author ? "" : ""; $text .= $website ? "" : ""; @@ -595,7 +606,7 @@ class themeHandler $text .= ""; $text .= $itext."
".TPVLAN_4.":".$author."
".TPVLAN_5.":".$website."
"; - $text .= "
Close
"; + // $text .= "
Close
"; return $text; } @@ -676,10 +687,19 @@ class themeHandler $previewbutton = (!$mode ? " " : ""); - $main_icon = ($pref['sitetheme'] != $theme['path']) ? "" : ""; - $info_icon = ""; - $preview_icon = ""; - $admin_icon = ($pref['admintheme'] != $theme['path']) ? "\n" : ""; + $main_icon = ($pref['sitetheme'] != $theme['path']) ? "" : ""; + // $info_icon = ""; + + $info_icon = "info"; + + + $preview_icon = ""; + // $preview_icon = "Preview"; + + // $preview_icon = "".($theme['preview'] ? "" : "").""; + + + $admin_icon = ($pref['admintheme'] != $theme['path']) ? "\n" : ""; $newpreview = "".($theme['preview'] ? "" : "").""; @@ -695,7 +715,7 @@ class themeHandler $text .= "
".$theme['name']." ".$theme['version']."
"; // $text .= "
\n\n\n".$main_icon.$admin_icon.$info_icon.$preview_icon."\n\n
"; - $text .= "
\n".$this->renderThemeInfo($theme)."
\n"; + // $text .= "
\n".$this->renderThemeInfo($theme)."
\n"; $text .= ""; return $text; diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css index 35451cf99..647f83757 100644 --- a/e107_themes/bootstrap/admin_style.css +++ b/e107_themes/bootstrap/admin_style.css @@ -47,6 +47,11 @@ a.brand:hover img { .sidebar-nav { font-size:12px; } } + +.modal { + min-width:800px; + +} @media (min-width: 1500px) {