diff --git a/e107_admin/theme.php b/e107_admin/theme.php index 944dde572..bbde48cf5 100644 --- a/e107_admin/theme.php +++ b/e107_admin/theme.php @@ -30,6 +30,10 @@ if(!empty($_GET['iframe'])) define('e_IFRAME', true); } +e107::css('inline', ' + .admin-ui-grid img { width: 100%; } +'); + //e107::js('core','bootstrap-suggest/dist/bootstrap-suggest.min.js'); //e107::css('core','bootstrap-suggest/dist/bootstrap-suggest.css'); @@ -131,12 +135,12 @@ class theme_admin extends e_admin_dispatcher protected $adminMenu = array( - 'main/main' => array('caption'=> TPVLAN_33, 'perm' => '0|1|TMP', 'icon'=>'fas-home'), - 'main/admin' => array('caption'=> TPVLAN_34, 'perm' => '0', 'icon'=>'fas-tachometer-alt'), - 'main/choose' => array('caption'=> TPVLAN_51, 'perm' => '0', 'icon'=>'fas-exchange-alt'), - 'main/online' => array('caption'=> TPVLAN_62, 'perm' => '0', 'icon'=>'fas-search'), - 'main/upload' => array('caption'=> TPVLAN_38, 'perm' => '0'), - 'convert/main' => array('caption'=> ADLAN_CL_6, 'perm' => '0', 'icon'=>'fas-toolbox') + 'main/main' => array('caption'=> 'TPVLAN_33', 'perm' => '0|1|TMP', 'icon'=>'fas-home'), + 'main/admin' => array('caption'=> 'TPVLAN_34', 'perm' => '0', 'icon'=>'fas-tachometer-alt'), + 'main/choose' => array('caption'=> 'TPVLAN_51', 'perm' => '0', 'icon'=>'fas-exchange-alt'), + 'main/online' => array('caption'=> 'TPVLAN_62', 'perm' => '0', 'icon'=>'fas-search'), + 'main/upload' => array('caption'=> 'TPVLAN_38', 'perm' => '0'), + 'convert/main' => array('caption'=> 'ADLAN_CL_6', 'perm' => '0', 'icon'=>'fas-toolbox') ); @@ -146,7 +150,7 @@ class theme_admin extends e_admin_dispatcher protected $adminMenuIcon = 'e-themes-24'; - protected $menuTitle = TPVLAN_26; + protected $menuTitle = 'TPVLAN_26'; function init() { @@ -320,24 +324,24 @@ class theme_admin_ui extends e_admin_ui // protected \$sortField = 'somefield_order'; // protected \$sortParent = 'somefield_parent'; // protected \$treePrefix = 'somefield_title'; - protected $grid = array('price'=>'price', 'version'=>'version','title'=>'name', 'image'=>'thumbnail', 'body'=>'', 'class'=>'col-md-2 col-sm-3', 'perPage'=>12, 'carousel'=>true, 'toggleButton'=>false); + protected $grid = array('price'=>'price', 'version'=>'version','title'=>'name', 'image'=>'thumbnail', 'body'=>'', 'class'=>'col-xxl-2 col-xl-3 col-lg-4 col-md-4 col-sm-6 col-xs-12', 'perPage'=>12, 'carousel'=>true, 'toggleButton'=>false); protected $fields = array( 'checkboxes' => array('title'=> '', 'type' => null, 'data' => null, 'width'=>'5%', 'thclass' =>'center', 'forced'=> TRUE, 'class'=>'center', 'toggle' => 'e-multiselect'), - 'id' => array('title'=> LAN_ID, 'type' => 'number', 'data' => 'int', 'width'=>'5%', 'thclass' => '', 'class'=>'center', 'forced'=> TRUE, 'primary'=>TRUE/*, 'noedit'=>TRUE*/), //Primary ID is not editable - 'name' => array('title'=> LAN_TITLE, 'type' => 'text', 'data' => 'str', 'width'=>'5%', 'thclass' => '', 'forced'=> TRUE, 'primary'=>TRUE/*, 'noedit'=>TRUE*/), //Primary ID is not editable - 'thumbnail' => array('title'=> LAN_IMAGE, 'type' => 'image', 'readParms'=>array('thumb'=>1,'w'=>300,'h'=>169,'crop'=>1, 'link'=>false, 'fallback'=>'{e_IMAGE}admin_images/nopreview.png'), 'data' => 'str', 'width'=>'auto', 'thclass' => '', 'batch' => TRUE, 'filter'=>TRUE), + 'id' => array('title'=> 'LAN_ID', 'type' => 'number', 'data' => 'int', 'width'=>'5%', 'thclass' => '', 'class'=>'center', 'forced'=> TRUE, 'primary'=>TRUE/*, 'noedit'=>TRUE*/), //Primary ID is not editable + 'name' => array('title'=> 'LAN_TITLE', 'type' => 'text', 'data' => 'str', 'width'=>'5%', 'thclass' => '', 'forced'=> TRUE, 'primary'=>TRUE/*, 'noedit'=>TRUE*/), //Primary ID is not editable + 'thumbnail' => array('title'=> 'LAN_IMAGE', 'type' => 'image', 'readParms'=>array('thumb'=>1,'w'=>375,'h'=>211,'crop'=>1, 'link'=>false, 'fallback'=>'{e_IMAGE}admin_images/nopreview.png'), 'data' => 'str', 'width'=>'auto', 'thclass' => '', 'batch' => TRUE, 'filter'=>TRUE), 'folder' => array('title'=> 'Folder', 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'thclass' => ''), - 'category' => array('title'=> LAN_CATEGORY, 'type' => 'dropdown', 'data' => 'str', 'filter'=>true, 'width' => 'auto', 'thclass' => '', 'writeParms'=>array()), + 'category' => array('title'=> 'LAN_CATEGORY', 'type' => 'dropdown', 'data' => 'str', 'filter'=>true, 'width' => 'auto', 'thclass' => '', 'writeParms'=>array()), 'version' => array('title'=> 'Version', 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'thclass' => ''), - 'price' => array('title'=> LAN_AUTHOR, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'thclass' => 'left'), + 'price' => array('title'=> 'LAN_AUTHOR', 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'thclass' => 'left'), // 'blank_authorURL' => array('title'=> "Url", 'type' => 'url', 'data' => 'str', 'width' => 'auto', 'thclass' => 'left'), // 'blank_date' => array('title'=> LAN_DATE, 'type' => 'datestamp', 'data' => 'int', 'width' => 'auto', 'thclass' => '', 'readParms' => 'long', 'writeParms' => 'type=datetime'), // 'blank_compatibility' => array('title'=> 'Compatible', 'type' => 'text', 'data' => 'str', 'width' => '10%', 'thclass' => 'center' ), // 'blank_url' => array('title'=> LAN_URL, 'type' => 'file', 'data' => 'str', 'width' => '20%', 'thclass' => 'center', 'batch' => TRUE, 'filter'=>TRUE, 'parms' => 'truncate=30', 'validate' => false, 'help' => 'Enter blank URL here', 'error' => 'please, ener valid URL'), // 'test_list_1' => array('title'=> 'test 1', 'type' => 'boolean', 'data' => 'int', 'width' => '5%', 'thclass' => 'center', 'batch' => TRUE, 'filter'=>TRUE, 'noedit' => true), - 'options' => array('title'=> LAN_OPTIONS, 'type' => 'method', 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced'=>TRUE) + 'options' => array('title'=> 'LAN_OPTIONS', 'type' => 'method', 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced'=>TRUE) ); //required - default column user prefs diff --git a/e107_core/shortcodes/batch/navigation_shortcodes.php b/e107_core/shortcodes/batch/navigation_shortcodes.php index 8aa2f0f37..6e7ec3ae0 100644 --- a/e107_core/shortcodes/batch/navigation_shortcodes.php +++ b/e107_core/shortcodes/batch/navigation_shortcodes.php @@ -262,7 +262,7 @@ require_once(__DIR__.'/navigation_shortcodes_legacy.php'); { $opts = array_merge($opts, $parm); } - + return $tp->toIcon($this->var['link_button'], $opts); } diff --git a/e107_themes/bootstrap3/css/modern-dark-2.css b/e107_themes/bootstrap3/css/modern-dark-2.css index 4d03c8075..9a3c5c2b6 100644 --- a/e107_themes/bootstrap3/css/modern-dark-2.css +++ b/e107_themes/bootstrap3/css/modern-dark-2.css @@ -1927,10 +1927,179 @@ div.is-table-row .sidebar-toggle-panel { /*display:none; */ overflow: visible !important; /* Ensure no clipping */ } #admin-ui-nav-menu li.divider { margin: 15px; border-bottom: 1px outset rgba(255,255,255,0.3) !important; } +.admin-ui-nav-menu .panel-title .tooltip { display:none; opacity:0; } .adminlist table td pre { max-width: 1200px !important; } .text-primary,.text-primary:hover{color:#337ab7 !important} .text-success,.text-success:hover{color:#51a351 !important} .text-danger,.text-danger:hover{color:#F86965 !important} .text-warning,.text-warning:hover{color:#f89406 !important} -.text-info,.text-info:hover{color:#8BC0ED !important} \ No newline at end of file +.text-info,.text-info:hover{color:#8BC0ED !important} + +/* Define the -xl breakpoint (≥1600px) */ +@media (min-width: 1600px) { + /* Container max-width for -xl */ + /* .container { + max-width: 1540px; + } +*/ + /* Base column styles for -xl */ + .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, + .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12 { + position: relative; + min-height: 1px; + padding-left: 15px; /* Matches Bootstrap 3’s @grid-gutter-width (30px) */ + padding-right: 15px; + float: left; + } + + /* Column widths (12-column grid) */ + .col-xl-12 { width: 100%; } + .col-xl-11 { width: 91.66666667%; } + .col-xl-10 { width: 83.33333333%; } + .col-xl-9 { width: 75%; } + .col-xl-8 { width: 66.66666667%; } + .col-xl-7 { width: 58.33333333%; } + .col-xl-6 { width: 50%; } + .col-xl-5 { width: 41.66666667%; } + .col-xl-4 { width: 33.33333333%; } + .col-xl-3 { width: 25%; } + .col-xl-2 { width: 16.66666667%; } + .col-xl-1 { width: 8.33333333%; } + + /* Offset classes */ + .col-xl-offset-12 { margin-left: 100%; } + .col-xl-offset-11 { margin-left: 91.66666667%; } + .col-xl-offset-10 { margin-left: 83.33333333%; } + .col-xl-offset-9 { margin-left: 75%; } + .col-xl-offset-8 { margin-left: 66.66666667%; } + .col-xl-offset-7 { margin-left: 58.33333333%; } + .col-xl-offset-6 { margin-left: 50%; } + .col-xl-offset-5 { margin-left: 41.66666667%; } + .col-xl-offset-4 { margin-left: 33.33333333%; } + .col-xl-offset-3 { margin-left: 25%; } + .col-xl-offset-2 { margin-left: 16.66666667%; } + .col-xl-offset-1 { margin-left: 8.33333333%; } + .col-xl-offset-0 { margin-left: 0; } + + /* Push classes */ + .col-xl-push-12 { left: 100%; } + .col-xl-push-11 { left: 91.66666667%; } + .col-xl-push-10 { left: 83.33333333%; } + .col-xl-push-9 { left: 75%; } + .col-xl-push-8 { left: 66.66666667%; } + .col-xl-push-7 { left: 58.33333333%; } + .col-xl-push-6 { left: 50%; } + .col-xl-push-5 { left: 41.66666667%; } + .col-xl-push-4 { left: 33.33333333%; } + .col-xl-push-3 { left: 25%; } + .col-xl-push-2 { left: 16.66666667%; } + .col-xl-push-1 { left: 8.33333333%; } + .col-xl-push-0 { left: auto; } + + /* Pull classes */ + .col-xl-pull-12 { right: 100%; } + .col-xl-pull-11 { right: 91.66666667%; } + .col-xl-pull-10 { right: 83.33333333%; } + .col-xl-pull-9 { right: 75%; } + .col-xl-pull-8 { right: 66.66666667%; } + .col-xl-pull-7 { right: 58.33333333%; } + .col-xl-pull-6 { right: 50%; } + .col-xl-pull-5 { right: 41.66666667%; } + .col-xl-pull-4 { right: 33.33333333%; } + .col-xl-pull-3 { right: 25%; } + .col-xl-pull-2 { right: 16.66666667%; } + .col-xl-pull-1 { right: 8.33333333%; } + .col-xl-pull-0 { right: auto; } + + /* Responsive visibility utilities */ + .visible-xl { display: block !important; } + table.visible-xl { display: table !important; } + tr.visible-xl { display: table-row !important; } + th.visible-xl, td.visible-xl { display: table-cell !important; } + .hidden-xl { display: none !important; } +} + +/* Define the -xxl breakpoint (≥1920px) */ +@media (min-width: 1920px) { + /* Container max-width for -xxl */ + /* .container { + max-width: 1860px; + }*/ + + /* Base column styles for -xxl */ + .col-xxl-1, .col-xxl-2, .col-xxl-3, .col-xxl-4, .col-xxl-5, .col-xxl-6, + .col-xxl-7, .col-xxl-8, .col-xxl-9, .col-xxl-10, .col-xxl-11, .col-xxl-12 { + position: relative; + min-height: 1px; + padding-left: 15px; /* Matches Bootstrap 3’s 30px gutter */ + padding-right: 15px; + float: left; + } + + /* Column widths (12-column grid) */ + .col-xxl-12 { width: 100%; } + .col-xxl-11 { width: 91.66666667%; } + .col-xxl-10 { width: 83.33333333%; } + .col-xxl-9 { width: 75%; } + .col-xxl-8 { width: 66.66666667%; } + .col-xxl-7 { width: 58.33333333%; } + .col-xxl-6 { width: 50%; } + .col-xxl-5 { width: 41.66666667%; } + .col-xxl-4 { width: 33.33333333%; } + .col-xxl-3 { width: 25%; } + .col-xxl-2 { width: 16.66666667%; } + .col-xxl-1 { width: 8.33333333%; } + + /* Offset classes */ + .col-xxl-offset-12 { margin-left: 100%; } + .col-xxl-offset-11 { margin-left: 91.66666667%; } + .col-xxl-offset-10 { margin-left: 83.33333333%; } + .col-xxl-offset-9 { margin-left: 75%; } + .col-xxl-offset-8 { margin-left: 66.66666667%; } + .col-xxl-offset-7 { margin-left: 58.33333333%; } + .col-xxl-offset-6 { margin-left: 50%; } + .col-xxl-offset-5 { margin-left: 41.66666667%; } + .col-xxl-offset-4 { margin-left: 33.33333333%; } + .col-xxl-offset-3 { margin-left: 25%; } + .col-xxl-offset-2 { margin-left: 16.66666667%; } + .col-xxl-offset-1 { margin-left: 8.33333333%; } + .col-xxl-offset-0 { margin-left: 0; } + + /* Push classes */ + .col-xxl-push-12 { left: 100%; } + .col-xxl-push-11 { left: 91.66666667%; } + .col-xxl-push-10 { left: 83.33333333%; } + .col-xxl-push-9 { left: 75%; } + .col-xxl-push-8 { left: 66.66666667%; } + .col-xxl-push-7 { left: 58.33333333%; } + .col-xxl-push-6 { left: 50%; } + .col-xxl-push-5 { left: 41.66666667%; } + .col-xxl-push-4 { left: 33.33333333%; } + .col-xxl-push-3 { left: 25%; } + .col-xxl-push-2 { left: 16.66666667%; } + .col-xxl-push-1 { left: 8.33333333%; } + .col-xxl-push-0 { left: auto; } + + /* Pull classes */ + .col-xxl-pull-12 { right: 100%; } + .col-xxl-pull-11 { right: 91.66666667%; } + .col-xxl-pull-10 { right: 83.33333333%; } + .col-xxl-pull-9 { right: 75%; } + .col-xxl-pull-8 { right: 66.66666667%; } + .col-xxl-pull-7 { right: 58.33333333%; } + .col-xxl-pull-6 { right: 50%; } + .col-xxl-pull-5 { right: 41.66666667%; } + .col-xxl-pull-4 { right: 33.33333333%; } + .col-xxl-pull-3 { right: 25%; } + .col-xxl-pull-2 { right: 16.66666667%; } + .col-xxl-pull-1 { right: 8.33333333%; } + .col-xxl-pull-0 { right: auto; } + + /* Responsive visibility utilities */ + .visible-xxl { display: block !important; } + table.visible-xxl { display: table !important; } + tr.visible-xxl { display: table-row !important; } + th.visible-xxl, td.visible-xxl { display: table-cell !important; } + .hidden-xxl { display: none !important; } +} \ No newline at end of file