diff --git a/admin/tmpl/cwmcpanel/default.php b/admin/tmpl/cwmcpanel/default.php
index 787338741..4ed922f09 100644
--- a/admin/tmpl/cwmcpanel/default.php
+++ b/admin/tmpl/cwmcpanel/default.php
@@ -14,14 +14,14 @@
// phpcs:enable PSR1.Files.SideEffects
-use CWM\Component\Proclaim\Administrator\Helper\Cwmhelper;
-use CWM\Component\Proclaim\Administrator\Lib\Cwmstats;
-use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Router\Route;
-use Joomla\Input\Input;
+ use CWM\Component\Proclaim\Administrator\Helper\Cwmhelper;
+ use CWM\Component\Proclaim\Administrator\Lib\Cwmstats;
+ use Joomla\CMS\HTML\HTMLHelper;
+ use Joomla\CMS\Language\Text;
+ use Joomla\CMS\Router\Route;
+ use Joomla\Input\Input;
-// Load the tooltip behavior.
+ // Load the tooltip behavior.
/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = $this->document->getWebAssetManager();
$wa->useScript('multiselect');
@@ -143,108 +143,133 @@ class="btn btn-primary btn-large">
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
mode) : ?>
-
-
-
-
-
-
-
-
-
+ endif; ?>
+
+
+
+
+
+
+
mode) : ?>
-
-
-
-
-
-
+ endif; ?>
diff --git a/media/css/general.css b/media/css/general.css
index f9fe62dae..882e5425e 100644
--- a/media/css/general.css
+++ b/media/css/general.css
@@ -66,7 +66,7 @@ div.current .panelform {
#pb4-perc,
#pb5-perc,
#pb6-perc {
- background: url('/media/images/progress-bar.gif') no-repeat scroll right center transparent;
+ background: url('/media/com_proclaim/images/progress-bar.gif') no-repeat scroll right center transparent;
height: 19px;
float: left;
}
@@ -307,9 +307,6 @@ table.fbstat .col2 {
display: block;
text-align: center;
}
-#dashboard-icons > .btn + .btn {
- float: left;
-}
.sermon-list-separator {
border: 0;
height: 4px;
diff --git a/media/css/general.css.map b/media/css/general.css.map
index 427c87f7c..6b2a420c4 100644
--- a/media/css/general.css.map
+++ b/media/css/general.css.map
@@ -1 +1 @@
-{"version":3,"sources":["../less/general.less"],"names":[],"mappings":"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","file":"general.css"}
\ No newline at end of file
+{"version":3,"sources":["../less/general.less"],"names":[],"mappings":"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","file":"general.css"}
\ No newline at end of file
diff --git a/media/css/general.min.css b/media/css/general.min.css
index 33bf2f45b..c5ed19d1d 100644
--- a/media/css/general.min.css
+++ b/media/css/general.min.css
@@ -1 +1 @@
-div.current .panelform{border:1px solid #ccc!important}#dashboard-icons>.btn+.btn,.inlineFields div{float:left}.inlineFields label{min-width:70px!important}#loading,.inlinePlayer{border:1px solid #000;background-color:#fff}#loading{-moz-border-radius:7px 7px 7px 7px;border-radius:7px 7px 7px 7px;padding:16px;text-align:center;top:0;width:158px;margin:7px}#loading span{font-weight:700}.inlinePlayer{position:absolute;width:290px;margin-left:-293px;height:24px;display:none}#checks,#decompress,#done,#download,#extensions,#install,#migration,#templates{margin:7px;border:2px dotted #e3e1e1;background-color:#fafafa;width:450px;padding-bottom:10px;height:100px}#pb0-box,#pb1-box,#pb2-box,#pb3-box,#pb4-box,#pb5-box,#pb6-box{background:url(/media/com_proclaim/images/progress-bar-back.gif) no-repeat right center;width:200px;height:19px}#pb0-perc,#pb1-perc,#pb2-perc,#pb3-perc,#pb4-perc,#pb5-perc,#pb6-perc{background:url(/media/images/progress-bar.gif) no-repeat right center;height:19px;float:left}.jbs_install_footer{border:1px solid #9cf;background:#d9d9ff;padding:20px;margin:20px;clear:both}.finishbutton,.finishbutton1:hover{height:150px;width:200px;outline:1px solid #ddd;border-top:1px solid #fff;padding:10px 10px 40px}.finishbutton{color:#fff;background:#f0f0f0}.finishbutton1:hover{background:#f0f088}img.imgcenter{display:block;margin-left:auto;margin-right:auto}.css-editor{width:97%;border:0}.blue{color:#08c;text-decoration:none}#fbadmin{text-align:left}#fbheader{clear:both}.fbmenu{width:14%}#fbheader,#fbmenu,#jbspaypal{padding-left:10px}#fbmenu a{display:block;font-size:11px;border-left:1px solid #ccc;border-bottom:1px solid #ccc}.fbmainmenu{padding:5px}.fbactivemenu{background:#fff;padding:5px}.fbright,.fbsubmenu{background:#fff;padding:5px 5px 5px 15px}.fbright{border:1px solid #ccc;padding:5px}.fbfooter,.fbfunctitle{padding:5px;background:#fbfbfb}.fbfooter{font-size:10px;text-align:right;border-bottom:1px solid #ccc;border-left:1px solid #ccc;border-right:1px solid #ccc}.fbfunctitle{font-size:16px;text-align:left;border:1px solid #ccc;font-weight:700;margin-bottom:10px;clear:both}.fbfuncsubtitle,table.fbstat caption{font-size:14px;font-weight:700;text-align:left}.fbfuncsubtitle{padding:5px;border-bottom:3px solid #7f9db9;color:#7f9db9;margin:10px 0}.fbrow0 td,.fbrow1 td{padding:8px 5px;text-align:left;border-bottom:1px dotted #ccc}td.fbtdtitle{font-weight:700;padding-left:10px;color:#666}#fbcongifcover fieldset{border:1px solid #cfdceb}#fbcongifcover fieldset legend{color:#666}.fbwelcome{clear:both;margin-bottom:10px;padding:10px;font-size:12px;color:#536482;line-height:140%;border:1px solid #ddd}.fbwelcome h3{margin:0;padding:0}table.thisform{width:100%;padding:10px;border-collapse:collapse}table.thisform tr.row0{background-color:#f7f8f9}table.thisform tr.row1{background-color:#eee}table.thisform th{font-size:15px;font-weight:400;font-variant:small-caps;padding:6px 4px 2px;text-align:left;height:25px;color:#666;background-repeat:repeat}table.thisform td{padding:3px;text-align:left}.fbstatscover{padding:0}table.fbstat{background-color:#fff;border:1px solid #ddd;padding:1px;width:100%}table.fbstat th{background:#eee;border-bottom:1px solid #ccc;border-top:1px solid #eee;color:#666;font-size:11px;padding:3px 4px;text-align:left}table.fbstat td{font-size:11px;line-height:140%;padding:4px;text-align:left}table.fbstat caption{clear:both;margin:10px 0 2px;padding:2px}table.fbstat .col1{background-color:#f1f3f5}table.fbstat .col2{background-color:#fbfbfb}#jbspaypal{padding-top:10px}#categoryItems{display:none}#loading{position:absolute;right:50px}.selectContainer{float:left;margin-left:5px}#articlesCategoriesContainer,#articlesItemsContainer,#docManItemsContainer,#loading,#virtueMartItemsContainer{display:none}#cpanel a{float:left;min-width:90px}#cpanel img{padding:10px 0;margin:0 auto}#cpanel span{display:block;text-align:center}.sermon-list-separator{border:0;height:4px;background-color:#fff;background-image:-webkit-linear-gradient(left,transparent,rgba(0,0,0,.25),transparent)}
\ No newline at end of file
+div.current .panelform{border:1px solid #ccc!important}.inlineFields div{float:left}.inlineFields label{min-width:70px!important}#loading,.inlinePlayer{border:1px solid #000;background-color:#fff}#loading{-moz-border-radius:7px 7px 7px 7px;border-radius:7px 7px 7px 7px;padding:16px;text-align:center;top:0;width:158px;margin:7px}#loading span{font-weight:700}.inlinePlayer{position:absolute;width:290px;margin-left:-293px;height:24px;display:none}#checks,#decompress,#done,#download,#extensions,#install,#migration,#templates{margin:7px;border:2px dotted #e3e1e1;background-color:#fafafa;width:450px;padding-bottom:10px;height:100px}#pb0-box,#pb1-box,#pb2-box,#pb3-box,#pb4-box,#pb5-box,#pb6-box{background:url(/media/com_proclaim/images/progress-bar-back.gif) no-repeat right center;width:200px;height:19px}#pb0-perc,#pb1-perc,#pb2-perc,#pb3-perc,#pb4-perc,#pb5-perc,#pb6-perc{background:url(/media/com_proclaim/images/progress-bar.gif) no-repeat right center;height:19px;float:left}.jbs_install_footer{border:1px solid #9cf;background:#d9d9ff;padding:20px;margin:20px;clear:both}.finishbutton,.finishbutton1:hover{height:150px;width:200px;outline:1px solid #ddd;border-top:1px solid #fff;padding:10px 10px 40px}.finishbutton{color:#fff;background:#f0f0f0}.finishbutton1:hover{background:#f0f088}img.imgcenter{display:block;margin-left:auto;margin-right:auto}.css-editor{width:97%;border:0}.blue{color:#08c;text-decoration:none}#fbadmin{text-align:left}#fbheader{clear:both}.fbmenu{width:14%}#fbheader,#fbmenu,#jbspaypal{padding-left:10px}#fbmenu a{display:block;font-size:11px;border-left:1px solid #ccc;border-bottom:1px solid #ccc}.fbmainmenu{padding:5px}.fbactivemenu{background:#fff;padding:5px}.fbright,.fbsubmenu{background:#fff;padding:5px 5px 5px 15px}.fbright{border:1px solid #ccc;padding:5px}.fbfooter,.fbfunctitle{padding:5px;background:#fbfbfb}.fbfooter{font-size:10px;text-align:right;border-bottom:1px solid #ccc;border-left:1px solid #ccc;border-right:1px solid #ccc}.fbfunctitle{font-size:16px;text-align:left;border:1px solid #ccc;font-weight:700;margin-bottom:10px;clear:both}.fbfuncsubtitle,table.fbstat caption{font-size:14px;font-weight:700;text-align:left}.fbfuncsubtitle{padding:5px;border-bottom:3px solid #7f9db9;color:#7f9db9;margin:10px 0}.fbrow0 td,.fbrow1 td{padding:8px 5px;text-align:left;border-bottom:1px dotted #ccc}td.fbtdtitle{font-weight:700;padding-left:10px;color:#666}#fbcongifcover fieldset{border:1px solid #cfdceb}#fbcongifcover fieldset legend{color:#666}.fbwelcome{clear:both;margin-bottom:10px;padding:10px;font-size:12px;color:#536482;line-height:140%;border:1px solid #ddd}.fbwelcome h3{margin:0;padding:0}table.thisform{width:100%;padding:10px;border-collapse:collapse}table.thisform tr.row0{background-color:#f7f8f9}table.thisform tr.row1{background-color:#eee}table.thisform th{font-size:15px;font-weight:400;font-variant:small-caps;padding:6px 4px 2px;text-align:left;height:25px;color:#666;background-repeat:repeat}table.thisform td{padding:3px;text-align:left}.fbstatscover{padding:0}table.fbstat{background-color:#fff;border:1px solid #ddd;padding:1px;width:100%}table.fbstat th{background:#eee;border-bottom:1px solid #ccc;border-top:1px solid #eee;color:#666;font-size:11px;padding:3px 4px;text-align:left}table.fbstat td{font-size:11px;line-height:140%;padding:4px;text-align:left}table.fbstat caption{clear:both;margin:10px 0 2px;padding:2px}table.fbstat .col1{background-color:#f1f3f5}table.fbstat .col2{background-color:#fbfbfb}#jbspaypal{padding-top:10px}#categoryItems{display:none}#loading{position:absolute;right:50px}.selectContainer{float:left;margin-left:5px}#articlesCategoriesContainer,#articlesItemsContainer,#docManItemsContainer,#loading,#virtueMartItemsContainer{display:none}#cpanel a{float:left;min-width:90px}#cpanel img{padding:10px 0;margin:0 auto}#cpanel span{display:block;text-align:center}.sermon-list-separator{border:0;height:4px;background-color:#fff;background-image:-webkit-linear-gradient(left,transparent,rgba(0,0,0,.25),transparent)}
\ No newline at end of file
diff --git a/media/less/general.less b/media/less/general.less
index 2005b36e7..d404ff316 100644
--- a/media/less/general.less
+++ b/media/less/general.less
@@ -357,12 +357,6 @@ table.fbstat {
}
}
-#dashboard-icons {
- > .btn + .btn {
- float: left;
- }
-}
-
.sermon-list-separator {
border: 0;
height: 4px;