Titles change based on election type

AppStateESS · Feb 28, 2018 · cddc5c6 · cddc5c6
1 parent a8b6cbf
commit cddc5c6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/boost/boost.php b/boost/boost.php
@@ -6,6 +6,6 @@
  */
 
 $proper_name = 'Election';
-$version = '2.1.1';
+$version = '2.1.2';
 $import_sql = true;
 $image_dir = true;
diff --git a/boost/update.php b/boost/update.php
@@ -74,6 +74,13 @@ function election_update(&$content, $version)
             $content[] = '+ Added travis';
             $content[] = '+ Updated babel compiler';
             $content[] = '</pre>';
+
+        case version_compare($version, '2.1.2', '<'):
+            $content[] = '<pre>';
+            $content[] = '2.1.2';
+            $content[] = '------';
+            $content[] = '+ Titles change based on election type';
+            $content[] = '</pre>';
     }
 
     return true;

diff --git a/class/Controller/User.php b/class/Controller/User.php
@@ -94,6 +94,11 @@ public static function loadNavBar()
         $vars['is_admin'] = \Current_User::allow('election');
         $vars['logout_uri'] = $auth->logout_link;
         $vars['username'] = \Current_User::getDisplayName();
+        if (\phpws\PHPWS_Settings::get('election', 'studentLevelAllowed') == 'U') {
+            $vars['election_type'] = 'SGA';
+        } else {
+            $vars['election_type'] = 'Graduate';
+        }
         $template = new \phpws2\Template($vars);
         $template->setModuleTemplate('election', 'navbar.html');
         $content = $template->get();

diff --git a/javascript/User/Election.jsx b/javascript/User/Election.jsx
@@ -410,7 +410,7 @@ const Finished = (props) => {
       <div className="col-sm-6 col-sm-offset-3">
         <div className="well text-center">
           <h2>{props.election.title}</h2>
-          <h3>Thank you for voting! Watch SGA for results.</h3>
+          <h3>Thank you for voting! Check our website for results.</h3>
           <a
             href="./index.php?module=users&action=user&command=logout"
             className="btn btn-lg btn-primary">Sign out</a>

diff --git a/templates/navbar.html b/templates/navbar.html
@@ -6,7 +6,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
     </button>
-    <span class="navbar-brand">SGA Elections</span>
+    <span class="navbar-brand"><?=$election_type?> Elections</span>
 </div>
 <!-- Collect the nav links, forms, and other content for toggling -->
 <div class="collapse navbar-collapse">