Update maintenance page and tweak maintenance mode behavior.

presidential-innovation-fellows · Aug 15, 2014 · 7410d72 · 7410d72
1 parent 42047b9
commit 7410d72
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 25 deletions.
diff --git a/application/routes.php b/application/routes.php
@@ -210,7 +210,12 @@
       && !Request::route()->is('maint')
       && !Request::route()->is('reports')
       && !Request::route()->is('admin')
-      ) {
+      && !Request::route()->is('superadmin')
+      && !Request::route()->is('signin')
+      && !Request::route()->is('signout')
+      && !Request::route()->is('account')
+      && (!Auth::officer() || !Auth::officer()->is_role_or_higher(Officer::ROLE_ADMIN))
+    ) {
     return Redirect::to('/maint');
   }
 

diff --git a/application/views/home/maint.jade b/application/views/home/maint.jade
@@ -2,6 +2,8 @@
 - Section::inject('no_page_header', true)
 
 .subheader
-  h1.home-tagline We're temporarily closed for maintenance.
-  h2.home-subline We apologize for the inconvenience. We'll be right back.
+  h1.home-tagline RFP-EZ is currently closed.
+  h2.home-subline
+  h2.home-subline Thank you for participating in the second RFP-EZ pilot.
+  h2.home-subline We're using the valuable feedback you've provided about the RFP-EZ experience to build an evolving line of innovative procurement tools and services.
 
diff --git a/application/views/home/maint.php b/application/views/home/maint.php
@@ -1,6 +1,8 @@
 <?php Section::inject('page_title', __('r.home.index_signed_out.site_tagline')) ?>
 <?php Section::inject('no_page_header', true) ?>
 <div class="subheader">
-  <h1 class="home-tagline">We're temporarily closed for maintenance.</h1>
-  <h2 class="home-subline">We apologize for the inconvenience. We'll be right back.</h2>
+  <h1 class="home-tagline">RFP-EZ is currently closed.</h1>
+  <h2 class="home-subline"></h2>
+  <h2 class="home-subline">Thank you for participating in the second RFP-EZ pilot.</h2>
+  <h2 class="home-subline">We're using the valuable feedback you've provided about the RFP-EZ experience to build an evolving line of innovative procurement tools and services.</h2>
 </div>
diff --git a/application/views/layout.jade b/application/views/layout.jade
@@ -99,7 +99,9 @@ body(class="#{$body_class}", data-current-page="#{Section::yield('current_page')
     !{$content}
 
 
-  !{View::make('partials.footer')}
+  - if (!Config::get('application.maint') == true):
+    !{View::make('partials.footer')}
+  - endif;
 
   - if (Request::is_env('production') || Request::is_env('ec2'))
     script(src="/js/vendor/google.analytics.js")

diff --git a/application/views/layout.php b/application/views/layout.php
@@ -80,7 +80,9 @@
     </div>
     <?php echo $content; ?>
   </div>
-  <?php echo View::make('partials.footer'); ?>
+  <?php if (!Config::get('application.maint') == true): ?>
+    <?php echo View::make('partials.footer'); ?>
+  <?php endif; ?>
   <?php if (Request::is_env('production') || Request::is_env('ec2')) { ?>
     <script src="/js/vendor/google.analytics.js"></script>
     <script src="/js/vendor/jquery.formtimer.js"></script>

diff --git a/application/views/partials/topnav.jade b/application/views/partials/topnav.jade
@@ -31,10 +31,12 @@
               - endif;
 
             - else:
-              li
-                a(href="#{ route('my_bids') }") Bids
-              li
-                a(href="#{ route('projects') }") Projects
+              - if (!Config::get('application.maint') == true):
+                li
+                  a(href="#{ route('my_bids') }") Bids
+                li
+                  a(href="#{ route('projects') }") Projects
+              - endif;
             - endif;
 
           ul.nav.pull-right
@@ -69,9 +71,11 @@
 
         - else:
 
-          ul.nav
-            li
-              a(href="#{ route('projects') }") Browse Projects
+          - if (!Config::get('application.maint') == true):
+            ul.nav
+              li
+                a(href="#{ route('projects') }") Browse Projects
+          - endif;
 
           ul.nav.pull-right
             li

diff --git a/application/views/partials/topnav.php b/application/views/partials/topnav.php
@@ -33,12 +33,14 @@
                 </li>
               <?php endif; ?>
             <?php else: ?>
-              <li>
-                <a href="<?php echo e( route('my_bids') ); ?>">Bids</a>
-              </li>
-              <li>
-                <a href="<?php echo e( route('projects') ); ?>">Projects</a>
-              </li>
+              <?php if (!Config::get('application.maint') == true): ?>
+                <li>
+                  <a href="<?php echo e( route('my_bids') ); ?>">Bids</a>
+                </li>
+                <li>
+                  <a href="<?php echo e( route('projects') ); ?>">Projects</a>
+                </li>
+              <?php endif; ?>
             <?php endif; ?>
           </ul>
           <ul class="nav pull-right">
@@ -76,11 +78,13 @@
             </li>
           </ul>
         <?php else: ?>
-          <ul class="nav">
-            <li>
-              <a href="<?php echo e( route('projects') ); ?>">Browse Projects</a>
-            </li>
-          </ul>
+          <?php if (!Config::get('application.maint') == true): ?>
+            <ul class="nav">
+              <li>
+                <a href="<?php echo e( route('projects') ); ?>">Browse Projects</a>
+              </li>
+            </ul>
+          <?php endif; ?>
           <ul class="nav pull-right">
             <li>
               <a href="#signinModal" data-toggle="modal">Sign In</a>