From adaca5b8b2b5227d79a72f3719ab10d70b78e9b4 Mon Sep 17 00:00:00 2001
From: Ismo Vuorinen <ismo.vuorinen@tampere.fi>
Date: Tue, 16 Jul 2013 18:42:36 +0300
Subject: [PATCH] Coding standard fixes. Routes: Error page override works now.
 Welcome controller: Return false where needed. Header-view: lnk-helper
 function to help highlight current page matching links. ecards-helper: lnk()
 and checkboxes(), needs commenting. new-view: values for javascript, Image
 name for dropdown.  style.css: better colours, footer links not so prominent,
 helper classes, moved cursor: move from users without javascript. scripts.js:
 documentation.

---
 application/config/constants.php      |  18 ++--
 application/config/routes.php         |   2 +-
 application/controllers/welcome.php   |   2 +
 application/helpers/ecards_helper.php |  77 ++++++++++++++
 application/views/_header.php         |  23 ++--
 application/views/new.php             |  21 ++--
 assets/css/style.css                  |  32 ++++--
 assets/js/scripts.js                  |   7 +-
 index.php                             | 144 +++++++++++++-------------
 9 files changed, 211 insertions(+), 115 deletions(-)
 create mode 100644 application/helpers/ecards_helper.php

diff --git a/application/config/constants.php b/application/config/constants.php
index 37c71bb..d58b401 100644
--- a/application/config/constants.php
+++ b/application/config/constants.php
@@ -31,14 +31,16 @@ define('DIR_WRITE_MODE', 0777);
 |
 */
 
-define('FOPEN_READ',							'rb');
-define('FOPEN_READ_WRITE',						'r+b');
-define('FOPEN_WRITE_CREATE_DESTRUCTIVE',		'wb'); // truncates existing file data, use with care
-define('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE',	'w+b'); // truncates existing file data, use with care
-define('FOPEN_WRITE_CREATE',					'ab');
-define('FOPEN_READ_WRITE_CREATE',				'a+b');
-define('FOPEN_WRITE_CREATE_STRICT',				'xb');
-define('FOPEN_READ_WRITE_CREATE_STRICT',		'x+b');
+define('FOPEN_READ', 'rb');
+define('FOPEN_READ_WRITE', 'r+b');
+define('FOPEN_WRITE_CREATE_DESTRUCTIVE', 'wb'); // truncates existing file data, use with care
+define('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE', 'w+b'); // truncates existing file data, use with care
+define('FOPEN_WRITE_CREATE', 'ab');
+define('FOPEN_READ_WRITE_CREATE', 'a+b');
+define('FOPEN_WRITE_CREATE_STRICT', 'xb');
+define('FOPEN_READ_WRITE_CREATE_STRICT', 'x+b');
+
+
 
 
 /* End of file constants.php */
diff --git a/application/config/routes.php b/application/config/routes.php
index f8be699..aa08896 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -46,7 +46,7 @@ if (empty($route)) {
 }
 
 $route['default_controller'] = "welcome";
-$route['404_override']       = 'error404';
+$route['404_override']       = 'welcome/error404';
 
 $route['uusi']               = $route['default_controller']."/newCard";
 $route['kaikki']             = $route['default_controller']."/ecards";
diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php
index 85b3a6e..8b91950 100644
--- a/application/controllers/welcome.php
+++ b/application/controllers/welcome.php
@@ -95,6 +95,8 @@ class Welcome extends CI_Controller
 
         }
 
+        return false;
+    }
     }
 
     public function upload()
diff --git a/application/helpers/ecards_helper.php b/application/helpers/ecards_helper.php
new file mode 100644
index 0000000..afb4efe
--- /dev/null
+++ b/application/helpers/ecards_helper.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * lnk helps return anchor tag with class when current_url() is site_url($match)
+ *
+ * @param  string $url   Your link inside the application, not for outside links
+ * @param  string $text  Link text
+ * @param  string $match What url to match against, use like $url
+ * @param  string $class What class should be added if urls match
+ *
+ * @author Ismo Vuorinen <ismo.vuorinen@tampere.fi>
+ *
+ * @return string        Formatted anchor tag with everything needed
+ */
+function lnk($url = null, $text = null, $match = null, $class = ' active')
+{
+    // $url should be "controller/action", no need to give full url
+    $url = site_url($url);
+
+    // Test matching, are we on the page we want to match against?
+    if (empty($match)) {
+        $match = current_url();
+    } else {
+        $match = site_url($match);
+    }
+
+    // Return correctly formatted link
+    if ($url == $match) {
+        return '<a class="' . $class . '" href="' . $url . '">' . $text . '</a>';
+    } else {
+        return '<a href="'. $url .'">' . $text . '</a>';
+    }
+}
+
+function checkboxed(
+    $name,
+    $data,
+    $value,
+    $label,
+    $data_id = null,
+    $disabled = false,
+    $disabletext = null
+) {
+    $fieldname = null;
+    $labelname = null;
+    $string    = null;
+
+    $fieldname = 'data['.$data_id.']['.$name.']';
+    $labelname = $fieldname .'['. $data .']';
+
+    $string =   '<input type="radio" '
+            .   'name="' . $fieldname .'" '
+            .   'id="'   . $labelname . '" '
+            .   'value="'. $value.'"';
+
+    if ($data == $value) {
+        $string .= ' checked';
+    }
+
+    if (empty($disabletext)) {
+        $disabletext = 'Ei voida julkaista lähettäjän päätöksestä';
+    }
+
+    if ($disabled) {
+        $string .= ' disabled';
+        $label   = '<span data-tooltip class="has-tip tip-top" '
+                .  'data-width="180" title="' . $disabletext . '">' . $label . '</span>';
+    }
+
+    $string .=  '>';
+
+    if (!empty($label)) {
+        $string = '<label>' . $string . $label . '</label>';
+    }
+
+    return $string;
+}
diff --git a/application/views/_header.php b/application/views/_header.php
index 50601d7..8442d25 100644
--- a/application/views/_header.php
+++ b/application/views/_header.php
@@ -7,14 +7,14 @@ if (empty($page_title)) {
 }
 
 ?><!DOCTYPE html>
-<!--[if IE 8]>    <html class="no-js lt-ie9" lang="fi"> <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="fi"> <!--<![endif]-->
+<!--[if IE 8]><html class="no-js lt-ie9" lang="fi"><![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="fi"><!--<![endif]-->
 <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width" />
     <link rel="icon" href="<?php echo site_url('/favicon.ico'); ?>">
     <title><?php echo implode(" &raquo; ", $page_title); ?></title>
-<?php
+    <?php
     // Assets spark
     assets_css(
         array(
@@ -44,29 +44,30 @@ if (empty($page_title)) {
             <section class="top-bar-section">
                 <ul class="left">
                     <li class="divider"></li>
-                    <li><a class="active" href="<?php echo site_url("uusi"); ?>">Luo omasi!</a></li>
+                    <li><?= lnk("uusi", "Luo omasi!"); ?></li>
                     <li class="divider"></li>
-                    <li><a href="<?php echo site_url("kaikki"); ?>">Listaa kaikki</a></li>
+                    <li><?= lnk("kaikki", "Listaa kaikki"); ?></li>
                     <li class="divider"></li>
                     <li class="has-dropdown">
-                        <a href="<?php echo site_url("info"); ?>">Tietoa</a>
+                        <?= lnk("info", "Tietoa"); ?>
                         <ul class="dropdown">
-                            <li><a href="<?php echo site_url("info"); ?>#rekisteri">Rekisteriseloste</a></li>
-                            <li><a href="<?php echo site_url("info"); ?>#yhteystiedot">Yhteystiedot</a></li>
+                            <li><?= lnk("info#rekisteri", "Rekisteriseloste"); ?></li>
+                            <li><?= lnk("info#yhteystiedot", "Yhteystiedot"); ?></li>
                         </ul>
                     </li>
                 </ul>
-
 <?php
 if (isset($user) and ! empty($user)) {
+
+
     ?>
 
                 <ul class="left">
                     <li class="has-dropdown adminmenu">
-                        <a href="<?php echo site_url("yllapito"); ?>">Ylläpito</a>
+                        <a href="<?php echo site_url("yllapito"); ?>">
                         <ul class="dropdown">
                             <li class="has-dropdown">
-                                <a href="<?php echo site_url("yllapito/kortit"); ?>">Hallitse kortteja</a>
+                                <?= lnk("yllapito/ecards", "Hallitse kortteja"); ?>
                                 <ul class="dropdown">
                                     <li>
                                         <a href="<?php echo site_url("yllapito/ecards/moderate");?>">
diff --git a/application/views/new.php b/application/views/new.php
index 17785cd..dcd7735 100644
--- a/application/views/new.php
+++ b/application/views/new.php
@@ -29,7 +29,7 @@
                             </div>
                             <div class="small-12 large-9 columns">
                                 <input required type="text" id="sender_name"
-                                    name="sender_name" placeholder="Lähettäjän nimi">
+                                    name="sender_name" value="" placeholder="Lähettäjän nimi">
                             </div>
                         </div>
                         <div class="row">
@@ -38,7 +38,7 @@
                             </div>
                             <div class="small-12 large-9 columns">
                                 <input required type="email" id="sender_email"
-                                    name="sender_email" placeholder="Lähettäjän email">
+                                    name="sender_email" value="" placeholder="Lähettäjän email">
                             </div>
                         </div>
                     </div>
@@ -53,7 +53,7 @@
                             </div>
                             <div class="small-12 large-9 columns">
                                 <input required type="text" id="receiver_name"
-                                    name="receiver_name" placeholder="Vastaanottajan nimi">
+                                    name="receiver_name" value="" placeholder="Vastaanottajan nimi">
                             </div>
                         </div>
                         <div class="row">
@@ -62,7 +62,7 @@
                             </div>
                             <div class="small-12 large-9 columns">
                                 <input required type="email" id="receiver_email"
-                                    name="receiver_email" placeholder="Vastaanottajan email">
+                                    name="receiver_email" value="" placeholder="Vastaanottajan email">
                             </div>
                         </div>
                     </div>
@@ -79,12 +79,12 @@
 <?php
 if (! empty($images)) {
     foreach ($images as $i => $image) {
+        $name = pathinfo($image, PATHINFO_FILENAME);
 
-        ?>                            <option data-img-src='<?php echo
-                                $image;
+        ?>                            <option data-img-src='<?php echo $image;
                             ?>' value='<?php
-                                echo $i;
-                            ?>'>Cute Kitten <?=$i;?></option><?php
+                                echo $image;
+                            ?>'>Kuva: <?=$name;?></option><?php
             echo "\n";
     }
 }
@@ -102,7 +102,7 @@ if (! empty($images)) {
                     </div>
                     <div class="small-12 large-9 columns">
                         <input type="text" maxlength="200" id="message_title"
-                            name="message_title" placeholder="Moikka!">
+                            name="message_title" value="" placeholder="Moikka!">
                     </div>
                 </div>
                 <div class="row">
@@ -166,9 +166,6 @@ if (! empty($images)) {
                     </div>
                 </div>
 
-
-
-
             </form>
 
 
diff --git a/assets/css/style.css b/assets/css/style.css
index dc15003..db3053d 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -21,13 +21,30 @@ h1, h2, h3 {
     font-family: Georgia, 'Sans serif';
 }
 
+.center {
+    text-align: center;
+}
+.center * {
+    margin: 0 auto;
+}
+
 .top-bar-section .adminmenu > a {
-    background-color: #333 !important;
+    background-color: #805219 !important;
 }
 .top-bar-section .adminmenu a.logout {
     background-color: #900 !important;
 }
 
+.pagefooter a {
+    color: #333;
+    border-bottom: 1px dashed #333;
+    margin: 0 2px;
+}
+.pagefooter a:hover {
+    color: #000;
+    border-bottom: none;
+}
+
 .progress span {
     display: block;
     padding: 4px 5px;
@@ -37,13 +54,13 @@ h1, h2, h3 {
 }
 
 .progress span.queue {
-    background: #111;
+    background: #699938;
 }
 .progress span.public {
-    background: #333;
+    background: #9ecb45;
 }
 .progress span.private {
-    background: #555;
+    background: #f69637;
 }
 .progress span.hidden {
     background: #777;
@@ -112,6 +129,8 @@ h1, h2, h3 {
     left: 0px;
     border: 1px solid #333;
     z-index: 1;
+    width: 100%;
+    height: auto;
 }
 
 .postcard_preview {
@@ -135,8 +154,7 @@ h1, h2, h3 {
     color:      #fff;
     text-shadow: 0px 0px 10px rgba(150, 150, 150, 1);
     width:      90%;
-    cursor:     move;
-    border:     1px dashed #666;
+    border:     1px dashed transparent;
 }
 #message_title_preview {
     top:        20px;
@@ -150,6 +168,8 @@ h1, h2, h3 {
 
 .ui-draggable-dragging,
 .ui-resizable-resizing {
+    cursor:     move;
+    border:     1px dashed #666;
     background: #fff;
     background: rgba(255, 255, 255, 0.5);
 }
diff --git a/assets/js/scripts.js b/assets/js/scripts.js
index 9085567..a9b59a3 100644
--- a/assets/js/scripts.js
+++ b/assets/js/scripts.js
@@ -45,7 +45,6 @@ jQuery(document).ready(function($) {
         $('div#message_text_preview').text(message_text_preview_text);
     });
 
-
     // Sizing and placement of preview elements
     $('#message_title_preview, #message_text_preview')
         .draggable({
@@ -80,11 +79,11 @@ jQuery(document).ready(function($) {
             }
         });
 
-
+    // Set panel height on initiation
     $('#previewpanel').height( $('#previewimage').height() );
 
-    setElementPlaces();
-    checkSizesTimer();
+    setElementPlaces(); // Populate our image place fields
+    checkSizesTimer();  // If we change window size, make everything adjust
 
     /**
      * checkSizesTimer changes inputs
diff --git a/index.php b/index.php
index 0cab8ab..df75880 100644
--- a/index.php
+++ b/index.php
@@ -19,12 +19,16 @@
  *
  */
 $config_baselocation = dirname(__FILE__) . '/application/config/';
-if( is_readable( $config_baselocation . 'development/_config.php' ) ) {
-	define('ENVIRONMENT', 'development');
-} elseif( is_readable( $config_baselocation . 'production/_config.php' ) ) {
-	define('ENVIRONMENT', 'production');
-} else {
-	die("No config found {$config_baselocation}/development/config.php nor {$config_baselocation}/production/config.php");
+if (is_readable($config_baselocation . 'production/config.php')) {
+    define('ENVIRONMENT', 'production');
+}
+if (is_readable($config_baselocation . 'development/config.php') && ! defined('ENVIRONMENT')) {
+    define('ENVIRONMENT', 'development');
+}
+
+if (! defined('ENVIRONMENT')) {
+    die("No config found {$config_baselocation}/development/config.php "
+        ."nor {$config_baselocation}/production/config.php");
 }
 
 /*
@@ -36,22 +40,19 @@ if( is_readable( $config_baselocation . 'development/_config.php' ) ) {
  * By default development will show errors but testing and live will hide them.
  */
 
-if (defined('ENVIRONMENT'))
-{
-	switch (ENVIRONMENT)
-	{
-		case 'development':
-			error_reporting(E_ALL);
-		break;
-
-		case 'testing':
-		case 'production':
-			error_reporting(0);
-		break;
-
-		default:
-			exit('The application environment is not set correctly.');
-	}
+if (defined('ENVIRONMENT')) {
+    switch (ENVIRONMENT)
+    {
+        case 'development':
+            error_reporting(E_ALL);
+            break;
+        case 'testing':
+        case 'production':
+            error_reporting(0);
+            break;
+        default:
+            exit('The application environment is not set correctly.');
+    }
 }
 
 /*
@@ -64,7 +65,7 @@ if (defined('ENVIRONMENT'))
  * as this file.
  *
  */
-	$system_path = 'system';
+    $system_path = 'system';
 
 /*
  *---------------------------------------------------------------
@@ -80,7 +81,7 @@ if (defined('ENVIRONMENT'))
  * NO TRAILING SLASH!
  *
  */
-	$application_folder = 'application';
+    $application_folder = 'application';
 
 /*
  * --------------------------------------------------------------------
@@ -102,15 +103,15 @@ if (defined('ENVIRONMENT'))
  * Un-comment the $routing array below to use this feature
  *
  */
-	// The directory name, relative to the "controllers" folder.  Leave blank
-	// if your controller is not in a sub-folder within the "controllers" folder
-	// $routing['directory'] = '';
+    // The directory name, relative to the "controllers" folder.  Leave blank
+    // if your controller is not in a sub-folder within the "controllers" folder
+    // $routing['directory'] = '';
 
-	// The controller class file name.  Example:  Mycontroller
-	// $routing['controller'] = '';
+    // The controller class file name.  Example:  Mycontroller
+    // $routing['controller'] = '';
 
-	// The controller function you wish to be called.
-	// $routing['function']	= '';
+    // The controller function you wish to be called.
+    // $routing['function'] = '';
 
 
 /*
@@ -128,7 +129,7 @@ if (defined('ENVIRONMENT'))
  * Un-comment the $assign_to_config array below to use this feature
  *
  */
-	// $assign_to_config['name_of_config_item'] = 'value of config item';
+    // $assign_to_config['name_of_config_item'] = 'value of config item';
 
 
 
@@ -142,62 +143,59 @@ if (defined('ENVIRONMENT'))
  * ---------------------------------------------------------------
  */
 
-	// Set the current directory correctly for CLI requests
-	if (defined('STDIN'))
-	{
-		chdir(dirname(__FILE__));
-	}
+// Set the current directory correctly for CLI requests
+if (defined('STDIN')) {
+    chdir(dirname(__FILE__));
+}
 
-	if (realpath($system_path) !== FALSE)
-	{
-		$system_path = realpath($system_path).'/';
-	}
+if (realpath($system_path) !== false) {
+    $system_path = realpath($system_path).'/';
+}
 
-	// ensure there's a trailing slash
-	$system_path = rtrim($system_path, '/').'/';
+// ensure there's a trailing slash
+$system_path = rtrim($system_path, '/').'/';
 
-	// Is the system path correct?
-	if ( ! is_dir($system_path))
-	{
-		exit("Your system folder path does not appear to be set correctly. Please open the following file and correct this: ".pathinfo(__FILE__, PATHINFO_BASENAME));
-	}
+// Is the system path correct?
+if (! is_dir($system_path)) {
+    exit("Your system folder path does not appear to be set correctly. "
+        ."Please open the following file and correct this: "
+        . pathinfo(__FILE__, PATHINFO_BASENAME)
+    );
+}
 
 /*
  * -------------------------------------------------------------------
  *  Now that we know the path, set the main path constants
  * -------------------------------------------------------------------
  */
-	// The name of THIS file
-	define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME));
+    // The name of THIS file
+    define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME));
 
-	// The PHP file extension
-	// this global constant is deprecated.
-	define('EXT', '.php');
+    // The PHP file extension
+    // this global constant is deprecated.
+    define('EXT', '.php');
 
-	// Path to the system folder
-	define('BASEPATH', str_replace("\\", "/", $system_path));
+    // Path to the system folder
+    define('BASEPATH', str_replace("\\", "/", $system_path));
 
-	// Path to the front controller (this file)
-	define('FCPATH', str_replace(SELF, '', __FILE__));
+    // Path to the front controller (this file)
+    define('FCPATH', str_replace(SELF, '', __FILE__));
 
-	// Name of the "system folder"
-	define('SYSDIR', trim(strrchr(trim(BASEPATH, '/'), '/'), '/'));
+    // Name of the "system folder"
+    define('SYSDIR', trim(strrchr(trim(BASEPATH, '/'), '/'), '/'));
 
 
-	// The path to the "application" folder
-	if (is_dir($application_folder))
-	{
-		define('APPPATH', $application_folder.'/');
-	}
-	else
-	{
-		if ( ! is_dir(BASEPATH.$application_folder.'/'))
-		{
-			exit("Your application folder path does not appear to be set correctly. Please open the following file and correct this: ".SELF);
-		}
+    // The path to the "application" folder
+if (is_dir($application_folder)) {
+    define('APPPATH', $application_folder.'/');
+} else {
+    if (! is_dir(BASEPATH.$application_folder.'/')) {
+        exit("Your application folder path does not appear to be set correctly. "
+            ."Please open the following file and correct this: ".SELF);
+    }
 
-		define('APPPATH', BASEPATH.$application_folder.'/');
-	}
+    define('APPPATH', BASEPATH.$application_folder.'/');
+}
 
 /*
  * --------------------------------------------------------------------
@@ -210,4 +208,4 @@ if (defined('ENVIRONMENT'))
 require_once BASEPATH.'core/CodeIgniter.php';
 
 /* End of file index.php */
-/* Location: ./index.php */
\ No newline at end of file
+/* Location: ./index.php */