Minor copy and ui changes

GSA · Dec 17, 2012 · 7a8b9ca · 7a8b9ca
1 parent 455ba04
commit 7a8b9ca
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/application/controllers/restdb.php b/application/controllers/restdb.php
@@ -115,6 +115,8 @@ public function dashboard_get($user = null) {
 
 	private function get_user_dbs($user = null) {
 
+		$this->load->helper('restdb'); // used for properize
+
 		if (empty($user) && !$this->session->userdata('username')) {	
 			redirect('login');
 		}			
@@ -132,6 +134,7 @@ private function get_user_dbs($user = null) {
 
 		if ($query->num_rows() > 0) {
 			$data['user'] = $query->first_row('array');
+			$data['user']['name_full'] = properize($data['user']['name_full']);
 		}			
 
 		// Then check for database entries for that user			

diff --git a/application/helpers/restdb_helper.php b/application/helpers/restdb_helper.php
@@ -27,4 +27,9 @@ function slugify( $text ) {
 	return $text;
 }
 
+
+function properize($string) {
+  return $string.'\''.($string[strlen($string) - 1] != 's' ? 's' : '');
+}
+
 ?>
diff --git a/application/views/frontpage_view.php b/application/views/frontpage_view.php
@@ -19,6 +19,8 @@
 	    </ul>
 
 		<h4 style="margin-top : 2em">Requirements</h4>
+
+		<p>Each instance is meant to be multiuser with Github for user authentication and you're free to use this instance by <a href="/login">logging in</a>, but it's also very easy to install your own copy with these basic requirements:</p>
         <ul>
             <li>PHP 5.3</li>
             <li>MySQL (for storing user data and connection settings)</li>

diff --git a/application/views/header_inc_view.php b/application/views/header_inc_view.php
@@ -17,8 +17,8 @@
 
 			<?php $page_title = (!empty($page['title'])) ? $page['title'] : null?>
 
-            <li<?php if($page_title == 'Download') echo ' class="active"'?>><a href="/">Download</a></li>
-            <li<?php if($page_title == 'Developers') echo ' class="active"'?>><a href="/">Developers</a></li>
+            <li<?php if($page_title == 'Download') echo ' class="active"'?>><a href="https://github.com/philipashlock/RESTdb/archive/master.zip">Download</a></li>
+            <li<?php if($page_title == 'Developers') echo ' class="active"'?>><a href="https://github.com/philipashlock/RESTdb/">Developers</a></li>
             <li<?php if($page_title == 'About') echo ' class="active"'?>><a href="/">About</a></li>
           </ul>
 

diff --git a/application/views/user_view.php b/application/views/user_view.php
@@ -40,6 +40,11 @@
 
 			echo '</table>';
 
+		} else {
+?>
+		<p>
+			You haven't added any datasets yet. You can start by either <a href="/upload">Uploading a CSV</a> or <a href="/new">Connecting a Database</a>.
+<?php
 		}
 		?>