From c9f1d419ca320d13418a5adb3e9d41507d6d527c Mon Sep 17 00:00:00 2001 From: lonalore Date: Thu, 10 Nov 2016 12:22:40 +0100 Subject: [PATCH] Flexpanel layouts with preview images. --- e107_admin/includes/flexpanel.php | 244 +++++++++++++++++- .../includes/layouts/flexpanel_one_col.php | 112 ++++++++ .../includes/layouts/flexpanel_one_col.png | Bin 0 -> 2506 bytes .../layouts/flexpanel_three_col_bricks.php | 100 +++++++ .../layouts/flexpanel_three_col_bricks.png | Bin 0 -> 1956 bytes .../layouts/flexpanel_three_col_stacked.php | 90 +++++++ .../layouts/flexpanel_three_col_stacked.png | Bin 0 -> 2109 bytes .../layouts/flexpanel_two_col_bricks.php | 104 ++++++++ .../layouts/flexpanel_two_col_bricks.png | Bin 0 -> 2567 bytes .../layouts/flexpanel_two_col_stacked.php | 97 +++++++ .../layouts/flexpanel_two_col_stacked.png | Bin 0 -> 2427 bytes 11 files changed, 734 insertions(+), 13 deletions(-) create mode 100644 e107_admin/includes/layouts/flexpanel_one_col.php create mode 100644 e107_admin/includes/layouts/flexpanel_one_col.png create mode 100644 e107_admin/includes/layouts/flexpanel_three_col_bricks.php create mode 100644 e107_admin/includes/layouts/flexpanel_three_col_bricks.png create mode 100644 e107_admin/includes/layouts/flexpanel_three_col_stacked.php create mode 100644 e107_admin/includes/layouts/flexpanel_three_col_stacked.png create mode 100644 e107_admin/includes/layouts/flexpanel_two_col_bricks.php create mode 100644 e107_admin/includes/layouts/flexpanel_two_col_bricks.png create mode 100644 e107_admin/includes/layouts/flexpanel_two_col_stacked.php create mode 100644 e107_admin/includes/layouts/flexpanel_two_col_stacked.png 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 0000000000000000000000000000000000000000..31afa0747c22411a059867195412342bf04cd79a GIT binary patch literal 2506 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%0DC_N!1+kl#-Z{r}V9if{q zarL14XY@=!-&)6?B=D`(dDToT0To*dU2+e4O1>LcqM+ zN#WE8Zxm`g(?Dn*ZF{P{WP5Tmc7E)gZ%RV0X>x({G$-}vO4^%#y`RPO7|D6@0r0^% zP3v%_z*=B=eWOTG2%xZOyCVG zJbfX3aS)b*ZtP%W$m-^>AY_{mlqLgYg9UK|SrFhH8lcE5tDm z{b0ve*O79MCXSDDvQ!BUyIUTjCi|JlLTlmLNoP#UGGacL1yjyuZzibqNfvy#Gj}Bj!YahsaE`epCy~Qd%k~b1M`~ONHvjE);Arh zV@yG+Ay^IC(%S{H#?sTM;x><{k!>6-p$+3}p_?@VY$hcnW8wY#_sNPl zlTrU}R9$^Q+w7S-6GQm=Q{x5qEKa9Kge_#5=bOs<9|rubJU~2OO6(C`$s^3_?0)x1 zvDLt+91PhF?sQboREt^d27lfa)F(A28;jR#6ddY_VH>c<$LulAapAKAByTNyPsJxu4v_;Rb>@m?c8Hl~@Kcn8w47mksUf9W+AF(oP%oC{Yh(y^Icja6_|Cz(f zNyLfzB4qZg2D_tvUqaq5#aAie>bX0v_&t_c@WqD3I!TjC1~Y6r`D|$e;j7v8qH2}! z8q=_cp+zGx8?>gFz>}feBOch+n>ti13FuOnjO4dwLNzU~qeuVsLiZ=}cpHGYn2f~U zZC?l5WNh{V5&#n7e+<6a7Vmby`?oTAl+TN>9g;&xzJEP@EF@~LtE+?0R@|(?!R%Iv z#8+ABzM@adkmj+Wp~m~SC7~MU*+Y}cLH*W%JXXevDn|y;=dw(D_INmG{!nr zcQ$=URSbh#7(d5@4+wD&DDuBf|Kx#`X+r};GPU(Htd|%ozkFtzL~n^ zw8)6_m^0qB$Z>ePjWc!?2_3I_K4$|kO#&!^lF(t5R=dxHauc+xIPE2wdZnR8#-Ap9 zgS;!A?7pD9Y$)i{Uke9Ha=Q3!(P=_n<%oyRje4JiiR8YjkJn>`>94V4;Y^F*N@g^) zdHJ(d1Ea2uEsWo!W_>gb%j>zdALK8IP_az!)t?3`>`Vn&blXE1xH3o1u-17R?5rfh z<|%CWw0O&H#XmB#NzK#jVn zrRJ2QzCb@ELaIE#^F`qu&ty1H8k%>hfmqt>{H3slRKkv>7q7fM^vqC3mV$_?A$eMc z_*TF3tq`EMFv>l*K=+ z=nJO?m|I)D(eBA2C*8d9)>N}Of;n@?!3Y%@=dgF|I(lGDIVd_XWE6m=y!%5F zj!vRu8j7^zW@Mi!Q&pzjJI#H|0z0D%wMxlEWXlXU(8Qpzm7Lgr zXq*_Xe${b+?jhlSvj9qJT?_HRoJCkQrazL2QL72O=Z|a!&Hz{Y-tSmjb({2bsjIpc z!~5ZAmD>pBs;e9MA_Tv_vi{IFb`4)q8GKkts;7e)E8y(JjV({iX(i9l%HsT(xkszQV4fM{(%Ln>I?FCXq?$tMhj_b2PG@f&mgD{xhlEY~y(Bmu* zKFb_86i*w!$l7A$=hlMzzw~=om1tzbI7i%~$uH@AQhbd737wydUfx$eu@uZf~SQ`#)v{;H@X0XPAk8$Hng zX}A&%Mg8P8Q4gBZ$q|(RaJau+A&~~bR}8&-xuOKC&Us%ZV{2o z21B;s`o8W!O10hI$KwBRP7kEHj@2ra&iQzAr|$RCnpf1KO}N;Ih2cVMKe(`u<%ukD$oRM+awJB_)RjhEt=nDAA%I zer!;I)78`U16)$43~ygdHXPVZq16hx1dw`v;I+(bbxQ7?`8l+7K2OKtwQK7(*PJRkt?kI#XbksIr1sbAzy-d^g?`V0lX zbbim(^b literal 0 HcmV?d00001