diff --git a/e107_admin/includes/flexpanel.php b/e107_admin/includes/flexpanel.php index 120710692..f43813c77 100644 --- a/e107_admin/includes/flexpanel.php +++ b/e107_admin/includes/flexpanel.php @@ -46,7 +46,9 @@ class adminstyle_flexpanel extends adminstyle_infopanel if(varset($_GET['mode']) == 'customize') { - e107::css('inline', '.layout-container label.radio { float: left; padding: 0; max-width: 100px; margin: 7px; cursor: pointer; text-align: center; }'); + e107::css('inline', '.layout-container { display: table; margin-left: auto; margin-right: auto; }'); + e107::css('inline', '.layout-container label.radio { float: left; padding: 0; width: 120px; margin: 7px; cursor: pointer; text-align: center; }'); + e107::css('inline', '.layout-container label.radio img { margin-left: auto; margin-right: auto; display: block; }'); e107::css('inline', '.layout-container label.radio input { width: 100%; margin-left: auto; margin-right: auto; display: block; }'); e107::css('inline', '.layout-container label.radio p { width: 100%; text-align: center; display: block; margin: 20px 0 0 0; }'); } @@ -265,8 +267,199 @@ class adminstyle_flexpanel extends adminstyle_infopanel switch(varset($user_pref['core-flexpanel-layout'], 'default')) { + case 'two_col_bricks': + if($id == 'core-infopanel_help') + { + $default['area'] = 'menu-area-01'; + $default['weight'] = 0; + } + + if($id == 'e-latest-list') + { + $default['area'] = 'menu-area-04'; + $default['weight'] = 1; + } + + if($id == 'e-status-list') + { + $default['area'] = 'menu-area-04'; + $default['weight'] = 2; + } + + if($id == 'core-infopanel_mye107') + { + $default['area'] = 'menu-area-02'; + $default['weight'] = 0; + } + + if($id == 'core-infopanel_news') + { + $default['area'] = 'menu-area-03'; + $default['weight'] = 0; + } + + if($id == 'core-infopanel_website_status') + { + $default['area'] = 'menu-area-03'; + $default['weight'] = 1; + } + break; + + case 'two_col_stacked': + if($id == 'core-infopanel_help') + { + $default['area'] = 'menu-area-01'; + $default['weight'] = 1; + } + + if($id == 'e-latest-list') + { + $default['area'] = 'menu-area-04'; + $default['weight'] = 0; + } + + if($id == 'e-status-list') + { + $default['area'] = 'menu-area-05'; + $default['weight'] = 0; + } + + if($id == 'core-infopanel_mye107') + { + $default['area'] = 'menu-area-02'; + $default['weight'] = 0; + } + + if($id == 'core-infopanel_news') + { + $default['area'] = 'menu-area-03'; + $default['weight'] = 0; + } + + if($id == 'core-infopanel_website_status') + { + $default['area'] = 'menu-area-12'; + $default['weight'] = 1; + } + break; + + case 'three_col_bricks': + if($id == 'core-infopanel_help') + { + $default['area'] = 'menu-area-02'; + $default['weight'] = 0; + } + + if($id == 'e-latest-list') + { + $default['area'] = 'menu-area-03'; + $default['weight'] = 0; + } + + if($id == 'e-status-list') + { + $default['area'] = 'menu-area-04'; + $default['weight'] = 0; + } + + if($id == 'core-infopanel_mye107') + { + $default['area'] = 'menu-area-01'; + $default['weight'] = 0; + } + + if($id == 'core-infopanel_news') + { + $default['area'] = 'menu-area-09'; + $default['weight'] = 0; + } + + if($id == 'core-infopanel_website_status') + { + $default['area'] = 'menu-area-13'; + $default['weight'] = 0; + } + break; + + case 'three_col_stacked': + if($id == 'core-infopanel_help') + { + $default['area'] = 'menu-area-03'; + $default['weight'] = 0; + } + + if($id == 'e-latest-list') + { + $default['area'] = 'menu-area-04'; + $default['weight'] = 0; + } + + if($id == 'e-status-list') + { + $default['area'] = 'menu-area-05'; + $default['weight'] = 0; + } + + if($id == 'core-infopanel_mye107') + { + $default['area'] = 'menu-area-02'; + $default['weight'] = 0; + } + + if($id == 'core-infopanel_news') + { + $default['area'] = 'menu-area-12'; + $default['weight'] = 0; + } + + if($id == 'core-infopanel_website_status') + { + $default['area'] = 'menu-area-13'; + $default['weight'] = 0; + } + break; + + case 'one_col': + if($id == 'core-infopanel_help') + { + $default['area'] = 'menu-area-01'; + $default['weight'] = 0; + } + + if($id == 'e-latest-list') + { + $default['area'] = 'menu-area-02'; + $default['weight'] = 0; + } + + if($id == 'e-status-list') + { + $default['area'] = 'menu-area-03'; + $default['weight'] = 0; + } + + if($id == 'core-infopanel_mye107') + { + $default['area'] = 'menu-area-04'; + $default['weight'] = 0; + } + + if($id == 'core-infopanel_news') + { + $default['area'] = 'menu-area-05'; + $default['weight'] = 0; + } + + if($id == 'core-infopanel_website_status') + { + $default['area'] = 'menu-area-06'; + $default['weight'] = 0; + } + break; + case 'wider_sidebar': case 'default': + default: if($id == 'core-infopanel_help') { $default['area'] = 'menu-area-01'; @@ -316,27 +509,52 @@ class adminstyle_flexpanel extends adminstyle_infopanel function renderLayoutPicker() { $tp = e107::getParser(); + $fr = e107::getForm(); + $fl = e107::getFile(); global $user_pref; - $default = varset($user_pref['core-flexpanel-layout'], 'default'); $html = '
'; - $html .= ''; + $layouts = array( + 'default', + 'wider_sidebar', + 'two_col_bricks', + 'two_col_stacked', + 'three_col_bricks', + 'three_col_stacked', + 'one_col', + ); - $html .= ''; + $files = $fl->get_files(e_ADMIN . 'includes/layouts/', "flexpanel_(.*).php", "standard", 1); + foreach($files as $num => $val) + { + $filename = basename($val['fname']); + $layout = str_replace('flexpanel_', '', $filename); + $layout = str_replace('.php', '', $layout); + + if(!in_array($layout, $layouts)) + { + $layouts[] = $layout; + } + } + + foreach($layouts as $layout) + { + $html .= ''; + } $html .= '
'; - $html .= '
'; return $html; diff --git a/e107_admin/includes/layouts/flexpanel_one_col.php b/e107_admin/includes/layouts/flexpanel_one_col.php new file mode 100644 index 000000000..b4f846741 --- /dev/null +++ b/e107_admin/includes/layouts/flexpanel_one_col.php @@ -0,0 +1,112 @@ + +
+ +
+ + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+'; diff --git a/e107_admin/includes/layouts/flexpanel_one_col.png b/e107_admin/includes/layouts/flexpanel_one_col.png new file mode 100644 index 000000000..31afa0747 Binary files /dev/null and b/e107_admin/includes/layouts/flexpanel_one_col.png differ diff --git a/e107_admin/includes/layouts/flexpanel_three_col_bricks.php b/e107_admin/includes/layouts/flexpanel_three_col_bricks.php new file mode 100644 index 000000000..b2a673ba3 --- /dev/null +++ b/e107_admin/includes/layouts/flexpanel_three_col_bricks.php @@ -0,0 +1,100 @@ + +
+ +
+ + +
+
+ +
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+
+'; diff --git a/e107_admin/includes/layouts/flexpanel_three_col_bricks.png b/e107_admin/includes/layouts/flexpanel_three_col_bricks.png new file mode 100644 index 000000000..e38a1561a Binary files /dev/null and b/e107_admin/includes/layouts/flexpanel_three_col_bricks.png differ diff --git a/e107_admin/includes/layouts/flexpanel_three_col_stacked.php b/e107_admin/includes/layouts/flexpanel_three_col_stacked.php new file mode 100644 index 000000000..40224611c --- /dev/null +++ b/e107_admin/includes/layouts/flexpanel_three_col_stacked.php @@ -0,0 +1,90 @@ + +
+ + +
+ + +
+
+ +
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+
+ +
+
+ + +
+
+'; diff --git a/e107_admin/includes/layouts/flexpanel_three_col_stacked.png b/e107_admin/includes/layouts/flexpanel_three_col_stacked.png new file mode 100644 index 000000000..f5ac86b12 Binary files /dev/null and b/e107_admin/includes/layouts/flexpanel_three_col_stacked.png differ diff --git a/e107_admin/includes/layouts/flexpanel_two_col_bricks.php b/e107_admin/includes/layouts/flexpanel_two_col_bricks.php new file mode 100644 index 000000000..12f7adb3b --- /dev/null +++ b/e107_admin/includes/layouts/flexpanel_two_col_bricks.php @@ -0,0 +1,104 @@ + +
+ +
+ + +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+'; diff --git a/e107_admin/includes/layouts/flexpanel_two_col_bricks.png b/e107_admin/includes/layouts/flexpanel_two_col_bricks.png new file mode 100644 index 000000000..8c75db61c Binary files /dev/null and b/e107_admin/includes/layouts/flexpanel_two_col_bricks.png differ diff --git a/e107_admin/includes/layouts/flexpanel_two_col_stacked.php b/e107_admin/includes/layouts/flexpanel_two_col_stacked.php new file mode 100644 index 000000000..eab43543f --- /dev/null +++ b/e107_admin/includes/layouts/flexpanel_two_col_stacked.php @@ -0,0 +1,97 @@ + +
+ +
+ + +
+
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+ + +
+
+'; diff --git a/e107_admin/includes/layouts/flexpanel_two_col_stacked.png b/e107_admin/includes/layouts/flexpanel_two_col_stacked.png new file mode 100644 index 000000000..d317159c0 Binary files /dev/null and b/e107_admin/includes/layouts/flexpanel_two_col_stacked.png differ