diff --git a/404.php b/404.php index 4da48e2..22a2165 100644 --- a/404.php +++ b/404.php @@ -5,7 +5,7 @@ if (!file_exists("config.php")) { } else { require_once("config.php"); - Template::render_header("Page not found"); + Template::render_header("Page not found", "notfound"); ?>

diff --git a/admin/dashboard.php b/admin/dashboard.php index 4ae5d5c..7b32733 100644 --- a/admin/dashboard.php +++ b/admin/dashboard.php @@ -18,7 +18,7 @@ if (isset($_GET['tasks'])) { Queue::process_queue(); } -Template::render_header(_("Dashboard"), true); +Template::render_header(_("Dashboard"), "dashboard", true); ?>
diff --git a/admin/login-form.php b/admin/login-form.php index c412114..b166bae 100644 --- a/admin/login-form.php +++ b/admin/login-form.php @@ -1,10 +1,10 @@

-
+

diff --git a/admin/lost-password.php b/admin/lost-password.php index c9cfe2a..2fb6ebd 100644 --- a/admin/lost-password.php +++ b/admin/lost-password.php @@ -1,5 +1,5 @@

diff --git a/admin/new-user.php b/admin/new-user.php index 54ce434..87766c5 100644 --- a/admin/new-user.php +++ b/admin/new-user.php @@ -3,7 +3,7 @@ if (isset($_GET['new'])) { User::add(); } -Template::render_header(_("New user"), true); ?> +Template::render_header(_("New user"), "newuser", true); ?>

Add new user

diff --git a/admin/options.php b/admin/options.php index 27f0702..45699de 100644 --- a/admin/options.php +++ b/admin/options.php @@ -92,7 +92,7 @@ if (!empty($_POST)) { define("CRON_SERVER_IP", $db->getSetting($mysqli,"cron_server_ip")); */ } -Template::render_header(_("Options"), true); +Template::render_header(_("Options"), "options", true); ?>

+ Template::render_header(_("New service group"), "servicegroup", true); ?>

+ Template::render_header(_("Edit service group"), "servicegroup", true); ?>

diff --git a/admin/service.php b/admin/service.php index 8c07488..9c68e96 100644 --- a/admin/service.php +++ b/admin/service.php @@ -34,14 +34,14 @@ if (isset($_GET['id']) && !isset($_POST['id'])) { if (!$boolEdit) { - Template::render_header(_("New service"), true); ?> + Template::render_header(_("New service"), "service", true); ?>

+ Template::render_header(_("New service"), "service", true); ?>

diff --git a/admin/settings.php b/admin/settings.php index 97c3cd9..f54ff79 100644 --- a/admin/settings.php +++ b/admin/settings.php @@ -7,7 +7,7 @@ if (isset($_GET['delete']) && isset($_GET['type'])) { } } -Template::render_header(_("Settings"), true); +Template::render_header(_("Settings"), "settings", true); ?>

Settings

diff --git a/admin/user.php b/admin/user.php index 218d2e5..94bdced 100644 --- a/admin/user.php +++ b/admin/user.php @@ -35,7 +35,7 @@ if (isset($_GET['what']) && $_GET['what'] == 'toggle') { $displayed_user->toggle(); } -Template::render_header(_("User"), true); +Template::render_header(_("User"), "user", true); ?>
diff --git a/classes/service.php b/classes/service.php index 4b45bc9..77d12b3 100644 --- a/classes/service.php +++ b/classes/service.php @@ -221,7 +221,7 @@ class Service implements JsonSerializable echo '
    '; //echo '
      '; // Render the group status if it exists - echo '
    •  ' . $this->group_name . '
      ' . _($statuses[$this->status]) . '
      • '; + echo '
    •  ' . $this->group_name . '
      ' . _($statuses[$this->status]) . '
      • '; //echo '
    • ' . $this->group_name .'
      status]).'
      • '; $arrCompletedGroups[] = $this->group_name; $boolOpened = true; @@ -241,7 +241,7 @@ class Service implements JsonSerializable if (!empty($this->description)) { echo ' '; } - if ($this->status != -1) { ?>
      status]); ?>
      + if ($this->status != -1) { ?>
      status]); ?>
      '; diff --git a/css/main.css b/css/main.css index 9bec61d..8a9725e 100644 --- a/css/main.css +++ b/css/main.css @@ -1,376 +1 @@ -body { - background: #ffffff; - margin: 0; - margin-top: 80px; - height: 100%; - line-height: 24px; - font-family: "Open Sans", sans-serif; -} - -img { - height: auto; - max-width: 100%; -} - -a { - padding: 0; - margin: 0; - text-decoration: none; -} - -a:hover, -a:focus { - text-decoration: none; - color: #f5f4f4; -} - -.centered { - text-align: center; -} - -.navbar { - background-color: gray; - border-radius: 0px 0px 30px 30px; -} - -main.container { - max-width: 1024px; - min-height: calc(100vh - 157px); - padding-right: 15px; - padding-left: 15px; - margin-left: auto; - margin-right: auto; -} - -#install .install, -#install form .card:not(:first-child) { - margin-top: 30px; -} - -#status-container .input-group:last-child { - margin-bottom: 0px !important; -} - -.status { - float: right; - font-size: 1.05em; -} - -#status-big { - margin-bottom: 20px; - padding: 15px; - border-radius: 5px; - font-size: 1.3em; -} - -.timeline { - position: relative; - padding: 0 0px 10px; - margin-top: 4px; -} - -.timeline .line { - position: absolute; - width: 2px; - display: block; - background: #c2c2c2; - top: 0px; - bottom: 0px; - margin-left: 31px; -} - -.timeline .servicelist { - position: relative; - margin: 10px 0px 21px 70px; - clear: both; -} - -.timeline .card { - position: relative; - margin: 10px 0px 21px 70px; - clear: both; -} - -.timeline .card::before { - position: absolute; - display: block; - top: 8px; - left: -24px; - content: ""; - width: 0px; - height: 0px; - border: inherit; - border-width: 12px; - border-top-color: transparent; - border-bottom-color: transparent; - border-left-color: transparent; -} - -.timeline .card .card-colore.icon * { - /*This shouldn't be relative in size...*/ - font-size: 20px; - vertical-align: middle; - line-height: 40px; -} -.timeline .card .card-colore.icon { - position: absolute; - left: -59px; - display: block; - width: 40px; - height: 40px; - padding: 0px; - border-radius: 50%; - text-align: center; - float: left; -} - -.timeline .card-outline { - border-color: transparent; - background: transparent; - box-shadow: none; -} - -.timeline .card-outline .panel-body { - padding: 10px 0px; -} - -.timeline .line::before { - top: -4px; -} - -.timeline .line::before { - content: ""; - position: absolute; - left: -4px; - width: 10px; - height: 10px; - display: block; - border-radius: 50%; - background: #c2c2c2; -} - -/* Footer */ -#footerwrap { - border-radius: 30px 30px 0px 0px; - min-height: 60px; - padding-top: 15px; - padding-bottom: 10px; - background: gray; -} - -#timeline h3 { - margin-top: 40px; - padding-left: 70px; -} - -#login-form { - padding-top: 20px; -} - -#time input { - max-width: 100%; -} - -.card.border-primary input#title { - width: 80%; -} - -.card:not(.border-primary) input#title { - width: 100%; -} - -.card:not(.border-primary) #time, -.card:not(.border-primary) #end_time_wrapper { - display: none; -} - -#time::-moz-placeholder, -#title::-moz-placeholder { - opacity: 1; -} - -article.card input { - background: transparent; - border: none; - border-bottom: 1px white outset; -} - -article.card textarea { - width: 100%; - background: transparent; - border: none; - resize: vertical; - min-height: 100px; -} - -#type { - margin-left: 70px; -} - -main.container.admin #timeline .service input[type="checkbox"] { - margin-right: 4px; - margin-top: 0; - vertical-align: middle; -} - -#status-container.error input { - box-shadow: 0px 0 2px 1px rgba(255, 0, 0, 1); -} - -.delete { - margin-left: 5px; - font-size: 1.2em; - color: white; - line-height: 25px; -} - -.delete:hover, -.delete:focus { - color: #eee; -} - -.new-service { - width: 100%; - min-width: 250px; -} - -.service label { - margin-bottom: 0; -} - -.install { - padding-bottom: 25px; -} - -#footerwrap .dropdown-menu { - background: gray; -} - -#footerwrap .dropdown-menu a { - color: white; - width: 100%; - padding: 2px 5px; - display: block; -} - -#footerwrap .dropdown-menu a:hover { - background-color: #2f8ad8; -} - -#footerwrap .input-group.dropup.mb-3 { - display: block; -} - -#footerwrap .input-group.dropup.mb-3 img { - max-height: 20px; - max-width: 25px; - margin-right: 5px; - vertical-align: middle; -} - -.col-md-4.text-left, -.col-md-4.text-right { - line-height: 2.5; -} - -body .h1, -body .h2, -body .h3, -body h1, -body h2, -body h3 { - margin-top: 18px; -} - -#options .input-group-text { - width: 230px; -} - -.row.user .input-group { - width: 100%; - margin-bottom: 5px; -} - -.row.user .form-name { - width: 50%; - float: left; -} - -label.form-name { - line-height: 20px; -} -.panel .panel-footer .label { - display: inline-block; -} -/* The switch - the box around the slider */ -#switch { - height: auto; - line-height: 34px; - font-size: 25px; -} - -#switch { - margin-bottom: 5px; -} - -.switch { - position: relative; - display: inline-block; - width: 60px; - height: 34px; -} - -/* Hide default HTML checkbox */ -.switch input { - opacity: 0; - width: 0; - height: 0; -} - -/* The slider */ -.slider { - position: absolute; - cursor: pointer; - top: 0; - left: 0; - right: 0; - bottom: 0; - background-color: #ccc; - -webkit-transition: 0.4s; - transition: 0.4s; -} - -.slider:before { - position: absolute; - content: ""; - height: 26px; - width: 26px; - left: 4px; - bottom: 4px; - background-color: white; - -webkit-transition: 0.4s; - transition: 0.4s; -} - -input:checked + .slider { - background-color: #2196f3; -} - -input:focus + .slider { - box-shadow: 0 0 1px #2196f3; -} - -input:checked + .slider:before { - -webkit-transform: translateX(26px); - -ms-transform: translateX(26px); - transform: translateX(26px); -} - -/* Rounded sliders */ -.slider.round { - border-radius: 34px; -} - -.slider.round:before { - border-radius: 50%; -} +body{background:#fff;margin:0;margin-top:80px;height:100%;line-height:24px;font-family:"Open Sans",sans-serif}body .h1,body .h2,body .h3,body h1,body h2,body h3{margin-top:18px}img{height:auto;max-width:100%}a{padding:0;margin:0;text-decoration:none}a:hover,a:focus{text-decoration:none;color:#f5f4f4}.centered{text-align:center}#switch{height:auto;line-height:34px;font-size:25px;margin-bottom:5px}#switch .switch{position:relative;display:inline-block;width:60px;height:34px}#switch .switch input{opacity:0;width:0;height:0}#switch .switch .slider{position:absolute;cursor:pointer;top:0;left:0;right:0;bottom:0;background-color:#ccc;transition:.4s}#switch .switch .slider:before{position:absolute;content:"";height:26px;width:26px;left:4px;bottom:4px;background-color:#fff;transition:.4s}#switch .switch .slider.round{border-radius:34px}#switch .switch .slider.round:before{border-radius:50%}#switch input:checked+.slider{background-color:#2196f3}#switch input:focus+.slider{box-shadow:0 0 1px #2196f3}#switch input:checked+.slider:before{transform:translateX(26px)}header.navbar{background-color:gray;border-radius:0px 0px 30px 30px}main.container{max-width:1024px;min-height:calc(100vh - 157px);padding-right:15px;padding-left:15px;margin-left:auto;margin-right:auto}main.container#install .settings{padding-bottom:25px}main.container#install .settings,main.container#install form .card:not(:first-child){margin-top:30px}main.container#status #status-big,main.container#dashboard #status-big{margin-bottom:20px;padding:15px;border-radius:5px;font-size:1.3em}main.container#status .timeline,main.container#dashboard .timeline{position:relative;padding:0 0px 10px;margin-top:4px}main.container#status .timeline h3,main.container#dashboard .timeline h3{margin-top:40px;padding-left:70px}main.container#status .timeline .line,main.container#dashboard .timeline .line{position:absolute;width:2px;display:block;background:#c2c2c2;top:0px;bottom:0px;margin-left:31px}main.container#status .timeline .line::before,main.container#dashboard .timeline .line::before{top:-4px;left:-4px;content:"";position:absolute;width:10px;height:10px;border-radius:50%;background:#c2c2c2}main.container#status .timeline .servicelist,main.container#dashboard .timeline .servicelist{position:relative;margin:10px 0px 21px 70px;clear:both}main.container#status .timeline .card,main.container#dashboard .timeline .card{margin:10px 0px 21px 70px}main.container#status .timeline .card::before,main.container#dashboard .timeline .card::before{position:absolute;top:8px;left:-24px;content:"";border:inherit;border-width:12px;border-top-color:transparent;border-bottom-color:transparent;border-left-color:transparent}main.container#status .timeline .card .card-colore.icon,main.container#dashboard .timeline .card .card-colore.icon{position:absolute;left:-59px;width:40px;height:40px;border-radius:50%;text-align:center}main.container#status .timeline .card .card-colore.icon i,main.container#dashboard .timeline .card .card-colore.icon i{font-size:20px;line-height:40px}main.container#status{font-size:1.05em}main.container#dashboard #status{width:230px;text-align:right}main.container#dashboard .card-header.bg-primary input{width:80%}main.container#dashboard .card-header:not(.border-primary) input#title{width:100%}main.container#dashboard .card-header:not(.border-primary) #time,main.container#dashboard .card-header:not(.border-primary) #end_time_wrapper{display:none}main.container#dashboard article.card input{background:transparent;border:none;border-bottom:1px #fff outset}main.container#dashboard article.card textarea{width:100%;background:transparent;border:none;resize:vertical;min-height:100px}main.container#dashboard article.card .delete{margin-left:5px;font-size:1.2em;color:#fff;line-height:25px}main.container#dashboard article.card .delete:hover,main.container#dashboard article.card .delete:focus{color:#eee}main.container#dashboard #type{margin-left:70px}main.container#dashboard #status-container.error input{box-shadow:0px 0 2px 1px red}main.container#login .wrapper{padding-top:20px}main.container#settings .input-group-text{width:230px}footer#footerwrap{border-radius:30px 30px 0px 0px;min-height:60px;padding-top:15px;padding-bottom:10px;background:gray}footer#footerwrap .dropdown-menu{background:gray}footer#footerwrap .dropdown-menu a{color:#fff;width:100%;padding:2px 5px;display:block}footer#footerwrap .dropdown-menu a:hover{background-color:#2f8ad8}footer#footerwrap .input-group.dropup.mb-3{display:block}footer#footerwrap .input-group.dropup.mb-3 img{max-height:20px;max-width:25px;margin-right:5px;vertical-align:middle}/*# sourceMappingURL=main.css.map */ \ No newline at end of file diff --git a/css/main.css.map b/css/main.css.map new file mode 100644 index 0000000..9557cc8 --- /dev/null +++ b/css/main.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["main.sass"],"names":[],"mappings":"AAAA,KACE,eAAA,CACA,QAAA,CACA,eAAA,CACA,WAAA,CACA,gBAAA,CACA,kCAAA,CAEA,mDACE,eAAA,CAEJ,IACE,WAAA,CACA,cAAA,CAEF,EACE,SAAA,CACA,QAAA,CACA,oBAAA,CAEA,gBACE,oBAAA,CACA,aAAA,CAEJ,UACE,iBAAA,CAEF,QACE,WAAA,CACA,gBAAA,CACA,cAAA,CACA,iBAAA,CAEA,gBACE,iBAAA,CACA,oBAAA,CACA,UAAA,CACA,WAAA,CAEA,sBACE,SAAA,CACA,OAAA,CACA,QAAA,CAEF,wBACE,iBAAA,CACA,cAAA,CACA,KAAA,CACA,MAAA,CACA,OAAA,CACA,QAAA,CACA,qBAAA,CAEA,cAAA,CAEA,+BACE,iBAAA,CACA,UAAA,CACA,WAAA,CACA,UAAA,CACA,QAAA,CACA,UAAA,CACA,qBAAA,CAEA,cAAA,CAEF,8BACE,kBAAA,CAEA,qCACE,iBAAA,CAGN,8BACE,wBAAA,CAEF,4BACE,0BAAA,CAEF,qCACE,0BAAA,CAEN,cACI,qBAAA,CACA,+BAAA,CAEJ,eACE,gBAAA,CACA,8BAAA,CACA,kBAAA,CACA,iBAAA,CACA,gBAAA,CACA,iBAAA,CAIE,iCACE,mBAAA,CAEF,qFAEE,eAAA,CAKF,uEACE,kBAAA,CACA,YAAA,CACA,iBAAA,CACA,eAAA,CAEF,mEACE,iBAAA,CACA,kBAAA,CACA,cAAA,CAEA,yEACE,eAAA,CACA,iBAAA,CAEF,+EACE,iBAAA,CACA,SAAA,CACA,aAAA,CACA,kBAAA,CACA,OAAA,CACA,UAAA,CACA,gBAAA,CAEA,+FACE,QAAA,CACA,SAAA,CACA,UAAA,CACA,iBAAA,CACA,UAAA,CACA,WAAA,CACA,iBAAA,CACA,kBAAA,CAEJ,6FACE,iBAAA,CACA,yBAAA,CACA,UAAA,CAEF,+EACE,yBAAA,CAEA,+FACE,iBAAA,CACA,OAAA,CACA,UAAA,CACA,UAAA,CACA,cAAA,CACA,iBAAA,CACA,4BAAA,CACA,+BAAA,CACA,6BAAA,CAEF,mHACE,iBAAA,CACA,UAAA,CACA,UAAA,CACA,WAAA,CACA,iBAAA,CACA,iBAAA,CAEA,uHACE,cAAA,CACA,gBAAA,CAEV,sBACE,gBAAA,CAYA,iCACE,WAAA,CACA,gBAAA,CAEF,uDACI,SAAA,CAIF,uEACE,UAAA,CAEF,8IAEE,YAAA,CAIF,4CACE,sBAAA,CACA,WAAA,CACA,6BAAA,CAEF,+CACE,UAAA,CACA,sBAAA,CACA,WAAA,CACA,eAAA,CACA,gBAAA,CAEF,8CACE,eAAA,CACA,eAAA,CACA,UAAA,CACA,gBAAA,CAEA,wGACE,UAAA,CAEN,+BACE,gBAAA,CAEF,uDACE,4BAAA,CAIF,8BACE,gBAAA,CAYF,0CACE,WAAA,CAKN,kBACE,+BAAA,CACA,eAAA,CACA,gBAAA,CACA,mBAAA,CACA,eAAA,CAEA,iCACE,eAAA,CAEA,mCACE,UAAA,CACA,UAAA,CACA,eAAA,CACA,aAAA,CAEA,yCACE,wBAAA,CAEN,2CACE,aAAA,CAEA,+CACE,eAAA,CACA,cAAA,CACA,gBAAA,CACA,qBAAA","file":"main.css"} \ No newline at end of file diff --git a/css/main.sass b/css/main.sass new file mode 100644 index 0000000..8581bd1 --- /dev/null +++ b/css/main.sass @@ -0,0 +1,277 @@ +body + background: #ffffff + margin: 0 + margin-top: 80px + height: 100% + line-height: 24px + font-family: "Open Sans", sans-serif + + .h1, .h2, .h3, h1, h2, h3 + margin-top: 18px + +img + height: auto + max-width: 100% + +a + padding: 0 + margin: 0 + text-decoration: none + + &:hover, &:focus + text-decoration: none + color: #f5f4f4 + +.centered + text-align: center + +#switch + height: auto + line-height: 34px + font-size: 25px + margin-bottom: 5px + + .switch + position: relative + display: inline-block + width: 60px + height: 34px + + input + opacity: 0 + width: 0 + height: 0 + + .slider + position: absolute + cursor: pointer + top: 0 + left: 0 + right: 0 + bottom: 0 + background-color: #ccc + -webkit-transition: 0.4s + transition: 0.4s + + &:before + position: absolute + content: "" + height: 26px + width: 26px + left: 4px + bottom: 4px + background-color: white + -webkit-transition: 0.4s + transition: 0.4s + + &.round + border-radius: 34px + + &:before + border-radius: 50% + + input + &:checked + .slider + background-color: #2196f3 + + &:focus + .slider + box-shadow: 0 0 1px #2196f3 + + &:checked + .slider:before + transform: translateX(26px) + +header.navbar + background-color: gray + border-radius: 0px 0px 30px 30px + +main.container + max-width: 1024px + min-height: calc(100vh - 157px) + padding-right: 15px + padding-left: 15px + margin-left: auto + margin-right: auto + + &#install + + .settings + padding-bottom: 25px + + .settings, + form .card:not(:first-child) + margin-top: 30px + + &#status, + &#dashboard + + #status-big + margin-bottom: 20px + padding: 15px + border-radius: 5px + font-size: 1.3em + + .timeline + position: relative + padding: 0 0px 10px + margin-top: 4px + + h3 + margin-top: 40px + padding-left: 70px + + .line + position: absolute + width: 2px + display: block + background: #c2c2c2 + top: 0px + bottom: 0px + margin-left: 31px + + &::before + top: -4px + left: -4px + content: "" + position: absolute + width: 10px + height: 10px + border-radius: 50% + background: #c2c2c2 + + .servicelist + position: relative + margin: 10px 0px 21px 70px + clear: both + + .card + margin: 10px 0px 21px 70px + + &::before + position: absolute + top: 8px + left: -24px + content: "" + border: inherit + border-width: 12px + border-top-color: transparent + border-bottom-color: transparent + border-left-color: transparent + + .card-colore.icon + position: absolute + left: -59px + width: 40px + height: 40px + border-radius: 50% + text-align: center + + i + font-size: 20px + line-height: 40px + + &#status + font-size: 1.05em + + &#notfound + + &#privacy + + &#subscripe + + &#subsmail + + &#dashboard + + #status + width: 230px + text-align: right + + .card-header.bg-primary input + width: 80% + + .card-header:not(.border-primary) + + input#title + width: 100% + + #time, + #end_time_wrapper + display: none + + article.card + + input + background: transparent + border: none + border-bottom: 1px white outset + + textarea + width: 100% + background: transparent + border: none + resize: vertical + min-height: 100px + + .delete + margin-left: 5px + font-size: 1.2em + color: white + line-height: 25px + + &:hover, &:focus + color: #eee + + #type + margin-left: 70px + + #status-container.error input + box-shadow: 0px 0 2px 1px rgba(255, 0, 0, 1) + + &#login + + .wrapper + padding-top: 20px + + &#lostpw + + &#newuser + + &#servicegroup + + &#service + + &#settings + + .input-group-text + width: 230px + + #user + + +footer#footerwrap + border-radius: 30px 30px 0px 0px + min-height: 60px + padding-top: 15px + padding-bottom: 10px + background: gray + + .dropdown-menu + background: gray + + a + color: white + width: 100% + padding: 2px 5px + display: block + + &:hover + background-color: #2f8ad8 + + .input-group.dropup.mb-3 + display: block + + img + max-height: 20px + max-width: 25px + margin-right: 5px + vertical-align: middle \ No newline at end of file diff --git a/email_subscriptions.php b/email_subscriptions.php index a06a29d..ef9c081 100644 --- a/email_subscriptions.php +++ b/email_subscriptions.php @@ -41,7 +41,7 @@ if (isset($_GET['new'])) { // Form validation for subscribers signing up $message = ""; - Template::render_header(_("Email Subscription")); + Template::render_header(_("Email Subscription"), "subsmail"); if (isset($_POST['emailaddress'])) { @@ -172,7 +172,7 @@ if (isset($_GET['new'])) { header('Location: subscriptions.php'); exit; } else { - Template::render_header(_("Email Subscription")); + Template::render_header(_("Email Subscription"), "subsmail"); $header = _("We cannot find a valid subscriber account matching those details"); $message = _("If you have recently subscribed, please make sure you activate the account within two hours of doing so. You are welcome to try and re-subscribe."); @@ -187,7 +187,7 @@ if (isset($_GET['new'])) { if ($subscriber->get_subscriber_by_token($_GET['token'])) { $subscriber->delete($subscriber->id); $subscriber->set_logged_off(); - Template::render_header(_("Email Subscription")); + Template::render_header(_("Email Subscription"), "subsmail"); $header = _("You have been unsubscribed from our system"); $message = _("We are sorry to see you go. If you want to subscribe again at a later date please feel free to re-subscribe."); @@ -195,7 +195,7 @@ if (isset($_GET['new'])) { } else { // TODO Log token for troubleshooting ? // Cannot find subscriber - show alert - Template::render_header(_("Email Subscription")); + Template::render_header(_("Email Subscription"), "subsmail"); $header = _("We are unable to find any valid subscriber detail matching your submitted data!"); $message = _("If you believe this to be an error, please contact the system admininistrator."); $constellation->render_warning($header, $message, true, WEB_URL, _('Go back')); diff --git a/index.php b/index.php index 18126a1..b81cf19 100644 --- a/index.php +++ b/index.php @@ -88,7 +88,7 @@ if($db->getSetting($mysqli,"notifyUpdates") == "yes"){ } } */ - Template::render_header("Status"); + Template::render_header("Status", "status"); ?>

      diff --git a/install.php b/install.php index d458fe4..69838ad 100644 --- a/install.php +++ b/install.php @@ -168,7 +168,7 @@ if (isset($_POST['server']) && empty($message)) { header("Location: " . WEB_URL); } } -Template::render_header(_("Install")); +Template::render_header(_("Install"), "install"); $php_version_req = sprintf(_("Minimum PHP version %s"), MINIMUM_PHP_VERSION); $preq_fail = array("times", "danger"); @@ -197,7 +197,7 @@ if (is_writable(__DIR__)) { } ?> -
      +
      @@ -223,7 +223,7 @@ if (is_writable(__DIR__)) {
      -
      +

      getSetting($mysqli, "url")); -Template::render_header("Privacy Policy"); +Template::render_header("Privacy Policy", "privacy"); echo "

      " . _("Privacy Policy") . "

      "; echo "

      " . _("Who we are") . "

      "; diff --git a/subscriptions.php b/subscriptions.php index fea6dbf..c38d975 100644 --- a/subscriptions.php +++ b/subscriptions.php @@ -22,7 +22,7 @@ define("TG_BOT_USERNAME", $db->getSetting($mysqli, "tg_bot_username")); $subscription = new Subscriptions(); $telegram = new Telegram(); -Template::render_header("Subscriptions"); +Template::render_header("Subscriptions", "subscripe"); if (SUBSCRIBE_TELEGRAM && $_SESSION['subscriber_typeid'] == 2) { $tg_user = $telegram->getTelegramUserData(); // TODO: Do we need this any longer? diff --git a/template.php b/template.php index 57c1ab5..f41f30b 100644 --- a/template.php +++ b/template.php @@ -17,7 +17,7 @@ class Template * @param String $page_name name of the page to be displayed as title * @param Boolean $admin decides whether to show admin menu */ - public static function render_header($page_name, $admin = false) + public static function render_header($page_name, $page_id, $admin = false) { if (!$admin) { // Create subscriber menu sections for later inclusion @@ -145,7 +145,7 @@ class Template
      -
      +