From 7becd7226438e16ef33d379a3ee70ad64fe06e6f Mon Sep 17 00:00:00 2001 From: Pavel Belyaev Date: Sun, 30 Jan 2022 22:25:52 +0500 Subject: [PATCH] hzhz --- CLASSES/core/LE_MOD_LOAD.php | 4 +++- CLASSES/core/LE_TPL.php | 7 +++++++ LE/load_mod.php | 2 ++ MODULES/admin/__space_init.php | 5 +++-- PUB/css/le_form.css | 6 +++++- PUB/css/le_form.min.css | 2 +- TPL/admin/test/top_menu.tpl | 2 +- demo-setup.sql | 15 +++++++++++++++ 8 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 demo-setup.sql diff --git a/CLASSES/core/LE_MOD_LOAD.php b/CLASSES/core/LE_MOD_LOAD.php index 4c19946..28b259d 100644 --- a/CLASSES/core/LE_MOD_LOAD.php +++ b/CLASSES/core/LE_MOD_LOAD.php @@ -1,6 +1,6 @@ select_path($space)===false) return false; + $this->space = $space; + $mod=arr_v(SYSCONF::$DEFAULT_MODULE,$space,false); //default if (!empty($mod_in_q)) { diff --git a/CLASSES/core/LE_TPL.php b/CLASSES/core/LE_TPL.php index a5b534b..7706b3e 100644 --- a/CLASSES/core/LE_TPL.php +++ b/CLASSES/core/LE_TPL.php @@ -30,6 +30,12 @@ class LE_TPL { return ob_get_clean(); } + public function fetch2mcont($t,&$vars=array(),$prefix=false,$cache_en=false) + { + $this->mod_cont .= $this->fetch($t,$vars,$prefix,$cache_en); + return $this; + } + public function path($tpl_path,$prefix=false) { if ($prefix===false) $prefix = $this->prefix; @@ -71,6 +77,7 @@ class LE_TPL { } + //static elements public $need_st_list=[],$static_list=[],$static_dep=[],$top_st=[],$bottom_st=[]; diff --git a/LE/load_mod.php b/LE/load_mod.php index cd7a3cf..91797b1 100644 --- a/LE/load_mod.php +++ b/LE/load_mod.php @@ -3,6 +3,8 @@ $le_mod_loader = new LE_MOD_LOAD(); LE::$QUERY_DATA_TYPE = LE_REQUEST::TYPE_DETECT(); LE::$FULL_URL = LE_REQUEST::url2arr()['full_url']; +//default mod prefix = space (for example - admin) +if ($le_mod_loader->space!==false) LE::$TPL->prefix=$le_mod_loader->space; //init space if ($le_mod_loader->init_path!==false) diff --git a/MODULES/admin/__space_init.php b/MODULES/admin/__space_init.php index 4298284..c7ab2c6 100644 --- a/MODULES/admin/__space_init.php +++ b/MODULES/admin/__space_init.php @@ -1,3 +1,4 @@ prefix="admin"; \ No newline at end of file +//default = current space name +//LE::$TPL->prefix="admin"; +LE::$ALC->set_lev(4); //только для авторизованных с нужным уровнем \ No newline at end of file diff --git a/PUB/css/le_form.css b/PUB/css/le_form.css index 745b083..f99fee3 100644 --- a/PUB/css/le_form.css +++ b/PUB/css/le_form.css @@ -150,7 +150,11 @@ textarea:focus { display: block; padding-top: 8px; } - +.le_he .le_fl span { + width:100%; + padding-right:1em; + text-align: right; +} /*Multi Element Horizontal*/ diff --git a/PUB/css/le_form.min.css b/PUB/css/le_form.min.css index b18a34f..55ab9c1 100644 --- a/PUB/css/le_form.min.css +++ b/PUB/css/le_form.min.css @@ -1 +1 @@ -body{font-family:sans-serif}input,select,textarea{border:1px solid #b8b8b8;border-radius:0;-webkit-border-radius:0;border-radius:0;padding:1px 5px;height:40px;box-sizing:border-box;font-family:inherit;font-size:16px}textarea{min-height:200px;padding:8px 8px}select{-webkit-appearance:none;-moz-appearance:none;padding-right:20px;background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2224%22%20height%3D%2216%22%20viewBox%3D%220%200%2024%2016%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%20%20%3Cpolygon%20fill%3D%22%23666%22%20points%3D%2212%201%209%206%2015%206%22%20%2F%3E%0A%20%20%20%20%3Cpolygon%20fill%3D%22%23666%22%20points%3D%2212%2013%209%208%2015%208%22%20%2F%3E%0A%3C%2Fsvg%3E%0A"),linear-gradient(to bottom,#fff 0,#fff 100%);background-repeat:no-repeat;background-size:30px auto,100%;background-position:right -5px top 50%,0 0}input[type=checkbox],input[type=radio]{display:inline-block;height:16px;width:16px;overflow:hidden;margin-top:-1px;vertical-align:middle;-webkit-appearance:none;-moz-appearance:none;background-color:transparent;background-repeat:no-repeat;background-position:50% 50%;border:1px solid #ccc;transition:.2s ease-in-out;transition-property:all;transition-property:background-color,border;margin-right:4px}input[type=radio]{border-radius:50%;margin-top:-4px}input[type=radio]:checked{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%20%20%3Ccircle%20fill%3D%22%23fff%22%20cx%3D%228%22%20cy%3D%228%22%20r%3D%222%22%20%2F%3E%0A%3C%2Fsvg%3E");background-color:#1e87f0;border-color:transparent;background-size:30px auto}input[type=checkbox]:checked{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2214%22%20height%3D%2211%22%20viewBox%3D%220%200%2014%2011%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%20%20%3Cpolygon%20fill%3D%22%23fff%22%20points%3D%2212%201%205%207.5%202%205%201%205.5%205%2010%2013%201.5%22%20%2F%3E%0A%3C%2Fsvg%3E%0A");background-color:#1e87f0;border-color:transparent}input:focus:not([type=checkbox]):not([type=radio]),select:focus,textarea:focus{outline:0;border-color:#70aae4;box-shadow:inset 0 0 3px -2px #117de9}.le_form{display:block;overflow:hidden;margin:10px 0;padding:25px;color:#555}.le_form_head{display:block;font-size:150%;padding-bottom:10px;border-bottom:1px solid #d9d9d9;margin-bottom:20px}.le_shadow{box-shadow:0 2px 10px rgba(94,94,94,.08);border:1px solid #ececec}.le_he .le_inp{margin-left:300px}.le_fl{font-size:14px}.le_he .le_fl{width:290px;float:left;display:flex;align-items:center;min-height:40px}.le_he,.le_ve{margin-bottom:25px;overflow:hidden;border-bottom:1px solid #e9e9e9;padding-bottom:25px}.le_ve .le_fl{margin-bottom:3px;display:block}.le_inp input:not([type=checkbox]):not([type=radio]),.le_inp select,.le_inp textarea{max-width:100%;width:100%}.le_me label{display:block;padding-top:8px}.le_meh label{float:left;margin-right:10px}.le_he{display:flex;flex-wrap:wrap}.le_he .le_fl{min-width:200px;flex:40%;flex-grow:1}.le_he .le_inp{margin-left:0;flex-grow:1;min-width:200px;flex:60%}.le_fl sup{color:red;font-size:17px;font-weight:700;padding-left:2px}[class^=le_btn]{cursor:pointer;display:inline-block;font-weight:400;text-align:center;white-space:nowrap;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;padding:.375rem .75rem;font-size:1rem;line-height:1.5;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;margin:2px 1px;border-radius:2px;border-style:solid;border-width:1px;color:#fff}.le_btn{background-color:#f9f9f9;border-color:#c9c9c9;color:#444}.le_btn:hover{background:#f3f3f3;border-color:#b5b5b5}.le_btn_gr{background-color:#449d44;border-color:#398439}.le_btn_gr:hover{background-color:#0a8f0a;border-color:#229322}.le_btn_bl{background-color:#337ab7;border-color:#2e6da4}.le_btn_bl:hover{background-color:#286090;border-color:#204d74}.le_btn_rd{background-color:#d9534f;border-color:#d43f3a}.le_btn_rd:hover{background-color:#c9302c;border-color:#ac2925}._green{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}#nav-icon6{width:60px;height:45px;position:relative;transition-duration:1s;margin:48px auto 12px auto;cursor:pointer}#nav-icon6 span{height:9px;width:60px;background-color:#337ab7;border-radius:20px;position:absolute;transition-duration:.25s;transition-delay:.25s}#nav-icon6 span:before{left:0;position:absolute;top:-18px;height:9px;width:60px;background-color:#337ab7;content:"";border-radius:20px;transition-duration:.25s;transition:transform .25s,top .25s .25s}#nav-icon6 span:after{left:0;position:absolute;top:18px;height:9px;width:60px;background-color:#337ab7;content:"";border-radius:20px;transition-duration:.25s;transition:transform .25s,top .25s .25s}#nav-icon6.open span{transition-duration:.1s;transition-delay:.25s;background:0 0}#nav-icon6.open span:before{transition:top .25s,transform .25s .25s;top:0;transform:rotateZ(-45deg)}#nav-icon6.open span:after{transition:top .4s,transform .25s .25s;top:0;transform:rotateZ(45deg)} \ No newline at end of file +body{font-family:sans-serif}input,select,textarea{border:1px solid #b8b8b8;border-radius:0;-webkit-border-radius:0;border-radius:0;padding:1px 5px;height:40px;box-sizing:border-box;font-family:inherit;font-size:16px}textarea{min-height:200px;padding:8px 8px}select{-webkit-appearance:none;-moz-appearance:none;padding-right:20px;background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2224%22%20height%3D%2216%22%20viewBox%3D%220%200%2024%2016%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%20%20%3Cpolygon%20fill%3D%22%23666%22%20points%3D%2212%201%209%206%2015%206%22%20%2F%3E%0A%20%20%20%20%3Cpolygon%20fill%3D%22%23666%22%20points%3D%2212%2013%209%208%2015%208%22%20%2F%3E%0A%3C%2Fsvg%3E%0A"),linear-gradient(to bottom,#fff 0,#fff 100%);background-repeat:no-repeat;background-size:30px auto,100%;background-position:right -5px top 50%,0 0}input[type=checkbox],input[type=radio]{display:inline-block;height:16px;width:16px;overflow:hidden;margin-top:-1px;vertical-align:middle;-webkit-appearance:none;-moz-appearance:none;background-color:transparent;background-repeat:no-repeat;background-position:50% 50%;border:1px solid #ccc;transition:.2s ease-in-out;transition-property:all;transition-property:background-color,border;margin-right:4px}input[type=radio]{border-radius:50%;margin-top:-4px}input[type=radio]:checked{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%20%20%3Ccircle%20fill%3D%22%23fff%22%20cx%3D%228%22%20cy%3D%228%22%20r%3D%222%22%20%2F%3E%0A%3C%2Fsvg%3E");background-color:#1e87f0;border-color:transparent;background-size:30px auto}input[type=checkbox]:checked{background-image:url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2214%22%20height%3D%2211%22%20viewBox%3D%220%200%2014%2011%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%20%20%3Cpolygon%20fill%3D%22%23fff%22%20points%3D%2212%201%205%207.5%202%205%201%205.5%205%2010%2013%201.5%22%20%2F%3E%0A%3C%2Fsvg%3E%0A");background-color:#1e87f0;border-color:transparent}input:focus:not([type=checkbox]):not([type=radio]),select:focus,textarea:focus{outline:0;border-color:#70aae4;box-shadow:inset 0 0 3px -2px #117de9}.le_form{display:block;overflow:hidden;margin:10px 0;padding:25px;color:#555}.le_form_head{display:block;font-size:150%;padding-bottom:10px;border-bottom:1px solid #d9d9d9;margin-bottom:20px}.le_shadow{box-shadow:0 2px 10px rgba(94,94,94,.08);border:1px solid #ececec}.le_he .le_inp{margin-left:300px}.le_fl{font-size:14px}.le_he .le_fl{width:290px;float:left;display:flex;align-items:center;min-height:40px}.le_he,.le_ve{margin-bottom:25px;overflow:hidden;border-bottom:1px solid #e9e9e9;padding-bottom:25px}.le_ve .le_fl{margin-bottom:3px;display:block}.le_inp input:not([type=checkbox]):not([type=radio]),.le_inp select,.le_inp textarea{max-width:100%;width:100%}.le_me label{display:block;padding-top:8px}.le_he .le_fl span{width:100%;padding-right:1em;text-align:right}.le_meh label{float:left;margin-right:10px}.le_he{display:flex;flex-wrap:wrap}.le_he .le_fl{min-width:200px;flex:40%;flex-grow:1}.le_he .le_inp{margin-left:0;flex-grow:1;min-width:200px;flex:60%}.le_fl sup{color:red;font-size:17px;font-weight:700;padding-left:2px}[class^=le_btn]{cursor:pointer;display:inline-block;font-weight:400;text-align:center;white-space:nowrap;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;padding:.375rem .75rem;font-size:1rem;line-height:1.5;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;margin:2px 1px;border-radius:2px;border-style:solid;border-width:1px;color:#fff}.le_btn{background-color:#f9f9f9;border-color:#c9c9c9;color:#444}.le_btn:hover{background:#f3f3f3;border-color:#b5b5b5}.le_btn_gr{background-color:#449d44;border-color:#398439}.le_btn_gr:hover{background-color:#0a8f0a;border-color:#229322}.le_btn_bl{background-color:#337ab7;border-color:#2e6da4}.le_btn_bl:hover{background-color:#286090;border-color:#204d74}.le_btn_rd{background-color:#d9534f;border-color:#d43f3a}.le_btn_rd:hover{background-color:#c9302c;border-color:#ac2925}._green{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}#nav-icon6{width:60px;height:45px;position:relative;transition-duration:1s;margin:48px auto 12px auto;cursor:pointer}#nav-icon6 span{height:9px;width:60px;background-color:#337ab7;border-radius:20px;position:absolute;transition-duration:.25s;transition-delay:.25s}#nav-icon6 span:before{left:0;position:absolute;top:-18px;height:9px;width:60px;background-color:#337ab7;content:"";border-radius:20px;transition-duration:.25s;transition:transform .25s,top .25s .25s}#nav-icon6 span:after{left:0;position:absolute;top:18px;height:9px;width:60px;background-color:#337ab7;content:"";border-radius:20px;transition-duration:.25s;transition:transform .25s,top .25s .25s}#nav-icon6.open span{transition-duration:.1s;transition-delay:.25s;background:0 0}#nav-icon6.open span:before{transition:top .25s,transform .25s .25s;top:0;transform:rotateZ(-45deg)}#nav-icon6.open span:after{transition:top .4s,transform .25s .25s;top:0;transform:rotateZ(45deg)} \ No newline at end of file diff --git a/TPL/admin/test/top_menu.tpl b/TPL/admin/test/top_menu.tpl index b752776..3d6148d 100644 --- a/TPL/admin/test/top_menu.tpl +++ b/TPL/admin/test/top_menu.tpl @@ -5,7 +5,7 @@