Merge pull request #4423 from annando/requeue

We now incrementally calculate the queue delivery time

diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php
index cff58fd5ff91aecd8ddac4b9ec94cfeaa2140dfb..b4161177b7b16ecd823d864d513e489c38ceca47 100644 (file)
--- a/view/theme/frio/config.php
+++ b/view/theme/frio/config.php
@@ -118,7 +118,7 @@ function frio_form($arr) {
                '$nav_icon_color'   => array_key_exists("nav_icon_color", $disable) ? "" : ['frio_nav_icon_color', L10n::t('Navigation bar icon color '), $arr['nav_icon_color']],
                '$link_color'       => array_key_exists("link_color", $disable) ? "" : ['frio_link_color', L10n::t('Link color'), $arr['link_color'], '', $link_colors],
                '$bgcolor'          => array_key_exists("bgcolor", $disable) ? "" : ['frio_background_color', L10n::t('Set the background color'), $arr['bgcolor']],
-               '$contentbg_transp' => array_key_exists("contentbg_transp", $disable) ? "" : ['frio_contentbg_transp', L10n::t("Content background transparency"), ((isset($arr["contentbg_transp"]) && $arr["contentbg_transp"] != "") ? $arr["contentbg_transp"] : 100)],
+               '$contentbg_transp' => array_key_exists("contentbg_transp", $disable) ? "" : ['frio_contentbg_transp', L10n::t("Content background opacity"), ((isset($arr["contentbg_transp"]) && $arr["contentbg_transp"] != "") ? $arr["contentbg_transp"] : 100)],
                '$background_image' => array_key_exists("background_image", $disable) ? "" : ['frio_background_image', L10n::t('Set the background image'), $arr['background_image'], $background_image_help],
                '$bg_image_options' => Image::get_options($arr),
        ];

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 2f5cc2f0ae7315f7f7889153bc2f5777af5d7fd8..95a8aa09f9c78becd3cb0dbe6a86f70189c69fd6 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -2134,6 +2134,11 @@ ul.dropdown-menu li:hover {
 .section-title-wrapper {
     overflow: hidden;
 }
+/* Home and Login Page */
+body.mod-home .navbar #nav-login,
+body.mod-login .navbar #nav-login {
+    display: none;
+}
 /* Profile-page */
 #profile-content-standard,
 #profile-content-advanced {

diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl
index 2fab6235307c8741656fb29d2cde888e230f727c..aa8d50fc01324f5dfef4cba997b89c78b88eeeb4 100644 (file)
--- a/view/theme/frio/templates/nav.tpl
+++ b/view/theme/frio/templates/nav.tpl
@@ -238,7 +238,6 @@
                </div>
                <div class="pull-right">
                        <ul class="nav navbar-nav navbar-right">
-                               {{if $nav.register}}<li><a href="register" data-toggle="tooltip" title="{{$nav.register.3}}"><i class="fa fa-street-view fa-fw" aria-hidden="true"></i></a></li>{{/if}}
                                <li>
                                        <a href="login?mode=none" id="nav-login"
                                                data-toggle="tooltip" title="{{$nav.login.3}}">