From 32871491e307dd2c874fff847f7f623030ba5e23 Mon Sep 17 00:00:00 2001
From: Karsten Heiken <karsten@disposed.de>
Date: Sat, 3 Sep 2011 11:42:10 +0200
Subject: [PATCH 1/7] Fix login view. Move from link_tag() to asset()

---
 application/views/auth/login.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/views/auth/login.php b/application/views/auth/login.php
index 6cf1ebb..0c492cc 100644
--- a/application/views/auth/login.php
+++ b/application/views/auth/login.php
@@ -6,12 +6,12 @@
 
 <title>ScattPort | <?=_('Login');?></title>
 
-<?= link_tag('assets/css/login.css'); ?>
-<?= link_tag('assets/css/form.css'); ?>
+<?=asset('css', 'login.css');?>
+<?=asset('css', 'form.css');?>
 
-<?= script_tag('assets/js/minmax.js'); ?>
-<?= script_tag('https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js'); ?>
-<?= script_tag('assets/js/scattport.js'); ?>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" language="javascript" type="text/javascript"></script>
+<?=asset('js', 'assets/js/minmax.js');?>
+<?=asset('js', 'assets/js/scattport.js');?>
 <script type="text/javascript">
 	var SITE_URL = '<?=site_url()?>';
 </script>

From f65941f1e38b33c94dc3ada419fdce92aa6f7c6f Mon Sep 17 00:00:00 2001
From: Karsten Heiken <karsten@disposed.de>
Date: Sat, 3 Sep 2011 12:03:03 +0200
Subject: [PATCH 2/7] Correct chevron style

When the menu is closed, the arrow has to point up.
---
 assets/css/style.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/css/style.css b/assets/css/style.css
index 5ca8985..a78e6f6 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -178,7 +178,7 @@ div.error {
 }
 
 .navigation ul li a {
-	background: url(../images/icons/chevron-small.png) -2px center no-repeat;
+	background: url(../images/icons/chevron-small-expand.png) -2px center no-repeat;
 	padding-left: 16px;
 	margin-left: -7px;
 	color: #fff;
@@ -192,7 +192,7 @@ div.error {
 }
 
 .navigation ul li.active a {
-	background: url(../images/icons/chevron-small-expand.png) -2px center no-repeat;
+	background: url(../images/icons/chevron-small.png) -2px center no-repeat;
 	color: #666;
 }
 

From ba140f8322cb48b813fab7e42ffd8b3bb43294c4 Mon Sep 17 00:00:00 2001
From: Karsten Heiken <karsten@disposed.de>
Date: Sat, 3 Sep 2011 12:48:09 +0200
Subject: [PATCH 3/7] It's togglable, not toggleable

ref: http://en.wiktionary.org/wiki/togglable
---
 application/views/header.php | 10 +++++-----
 assets/js/scattport.js       |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/views/header.php b/application/views/header.php
index 0cfeec6..25f0b10 100644
--- a/application/views/header.php
+++ b/application/views/header.php
@@ -68,7 +68,7 @@
 <?php
 	endif;
 ?>
-				<li class="toggleable" id="nav_projects">
+				<li class="togglable" id="nav_projects">
 					<a href="javascript:void(0);"><?=_('Projects');?></a>
 					<ul>
 						<li><a href="<?=site_url('projects/create');?>" title="<?=_('Create a new project');?>"><?=_('New project');?></a></li>
@@ -76,7 +76,7 @@
 						<li><a href="<?=site_url('projects/search');?>" title="<?=_('Search for a project');?>"><?=_('Search');?></a></li>
 					</ul>
 				</li>
-				<li class="toggleable" id="nav_calculations">
+				<li class="togglable" id="nav_calculations">
 					<a href="javascript:void(0);"><?=_('Calculations');?></a>
 					<ul>
 						<li><a href="<?=site_url('jobs/results');?>" title="<?=_('Show the newest results');?>"><?=_('Newest results');?></a></li>
@@ -91,7 +91,7 @@
 		</div>
 		<div class="navigation">
 			<ul>
-				<li class="toggleable" id="nav_own_projects">
+				<li class="togglable" id="nav_own_projects">
 					<a href="javascript:void(0);"><?=_('Own projects');?></a>
 					<ul>
 <?php
@@ -104,13 +104,13 @@
 ?>
 					</ul>
 				</li>
-				<li class="toggleable" id="nav_shared_projects">
+				<li class="togglable" id="nav_shared_projects">
 					<a href="javascript:void(0);"><?=_('Projects shared with me');?></a>
 					<ul>
 						<li><a href="#">Prisma</a></li>
 					</ul>
 				</li>
-				<li class="toggleable" id="nav_public_projects">
+				<li class="togglable" id="nav_public_projects">
 					<a href="javascript:void(0);"><?=_('Public projects');?></a>
 					<ul>
 						<li><a href="#">Beispielprojekt</a></li>
diff --git a/assets/js/scattport.js b/assets/js/scattport.js
index 6ad08cf..b7ab30b 100644
--- a/assets/js/scattport.js
+++ b/assets/js/scattport.js
@@ -293,7 +293,7 @@ $(document).ready(function() {
 		$('#' + toggled[i]).toggleClass('active').find('ul').hide();
 	}
 
-	$('.toggleable').find('a').not('ul li ul li a').click(function() {
+	$('.togglable').find('a').not('ul li ul li a').click(function() {
 		var id = $(this).parent().attr('id');
 
 		// toggle

From d9794cceb3ab76ab2617db44bddf6b4eed4096c0 Mon Sep 17 00:00:00 2001
From: Karsten Heiken <karsten@disposed.de>
Date: Sat, 3 Sep 2011 12:50:30 +0200
Subject: [PATCH 4/7] Fix search button: use correct path for image inclusion

---
 application/views/header.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/header.php b/application/views/header.php
index 25f0b10..c262e6b 100644
--- a/application/views/header.php
+++ b/application/views/header.php
@@ -126,7 +126,7 @@
 		<div class="box">
 			<form id="search-form" method="get" action="#">
 				<input type="text" name="search" id="search-input" class="search-input" />
-				<input type="image" src="<?=asset_url('image', 'button-search.gif');?>" id="search-submit" class="search-submit" />
+				<input type="image" src="<?=asset_url('images', 'button-search.gif');?>" id="search-submit" class="search-submit" />
 			</form>
 		</div>
 

From 48f40fa98678acc315d9f2c48e39d8f1623369e8 Mon Sep 17 00:00:00 2001
From: Karsten Heiken <karsten@disposed.de>
Date: Sat, 3 Sep 2011 13:01:04 +0200
Subject: [PATCH 5/7] Fix problem with SITE_URL not appending a slash

---
 application/views/header.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/header.php b/application/views/header.php
index c262e6b..a867f2e 100644
--- a/application/views/header.php
+++ b/application/views/header.php
@@ -18,8 +18,8 @@
 <?=asset('js', 'jtip.js');?>
 
 <script type="text/javascript">
-	var SITE_URL = '<?=site_url();?>';
-	var BASE_URL = '<?=base_url();?>';
+	var SITE_URL = '<?=site_url("/");?>';
+	var BASE_URL = '<?=base_url("/");?>';
 </script>
 
 </head>

From 79ea096959d19121fe378b289b554bebe73febc5 Mon Sep 17 00:00:00 2001
From: Karsten Heiken <karsten@disposed.de>
Date: Sat, 3 Sep 2011 13:12:46 +0200
Subject: [PATCH 6/7] Change link target from legal to license

---
 application/views/footer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/footer.php b/application/views/footer.php
index 50347ae..0e93f81 100644
--- a/application/views/footer.php
+++ b/application/views/footer.php
@@ -14,7 +14,7 @@
 
 		<span class="right">
 			<?=anchor('about', _('About'));?> |
-			<?=anchor('legal', _('License'));?>
+			<?=anchor('license', _('License'));?>
 		</span>
 		<span class="right">
 			<?=asset('image', 'iwt.gif', array('width' => 36));?>

From c38330fcac105ed081a8db6b96b98506b2d0df8c Mon Sep 17 00:00:00 2001
From: Karsten Heiken <karsten@disposed.de>
Date: Sat, 3 Sep 2011 13:13:09 +0200
Subject: [PATCH 7/7] Add static pages for license and about

The about page needs more information.
But we'll get to that later.
---
 application/controllers/about.php   | 44 +++++++++++++++++++++++++++++
 application/controllers/license.php | 44 +++++++++++++++++++++++++++++
 application/views/about.php         | 27 ++++++++++++++++++
 application/views/license.php       | 40 ++++++++++++++++++++++++++
 4 files changed, 155 insertions(+)
 create mode 100644 application/controllers/about.php
 create mode 100644 application/controllers/license.php
 create mode 100644 application/views/about.php
 create mode 100644 application/views/license.php

diff --git a/application/controllers/about.php b/application/controllers/about.php
new file mode 100644
index 0000000..0e7f09c
--- /dev/null
+++ b/application/controllers/about.php
@@ -0,0 +1,44 @@
+<?php
+/*
+ * Copyright (c) 2011 Karsten Heiken <karsten@disposed.de>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * Static about page
+ *
+ * @author Karsten Heiken <karsten@disposed.de>
+ */
+class About extends CI_Controller {
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct() {
+		parent::__construct();
+	}
+
+	public function index() {
+		$this->load->view('about');
+	}
+}
+
+/* End of file about.php */
+/* Location: ./application/controllers/about.php */
diff --git a/application/controllers/license.php b/application/controllers/license.php
new file mode 100644
index 0000000..a0166ed
--- /dev/null
+++ b/application/controllers/license.php
@@ -0,0 +1,44 @@
+<?php
+/*
+ * Copyright (c) 2011 Karsten Heiken <karsten@disposed.de>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * Static license page
+ *
+ * @author Karsten Heiken <karsten@disposed.de>
+ */
+class License extends CI_Controller {
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct() {
+		parent::__construct();
+	}
+
+	public function index() {
+		$this->load->view('license');
+	}
+}
+
+/* End of file license.php */
+/* Location: ./application/controllers/license.php */
diff --git a/application/views/about.php b/application/views/about.php
new file mode 100644
index 0000000..3c0839d
--- /dev/null
+++ b/application/views/about.php
@@ -0,0 +1,27 @@
+<?php $this->load->view('header'); ?>
+
+<div id="content">
+
+	<div class="title">
+		<h2><?=_('About');?></h2>
+	</div>
+
+	<div class="box">
+		<h3><?=_('Introduction');?></h3>
+		<p>
+		</p>
+	</div>
+	<div class="box">
+		<h3><?=_('Contributors');?></h3>
+		<p>
+			<h4>Programming</h4>
+			<ul>
+				<li>Karsten Heiken, 2011</li>
+				<li>Eike Foken, 2011</li>
+			</ul>
+		</p>
+	</div>
+
+</div>
+
+<?php $this->load->view('footer'); ?>
diff --git a/application/views/license.php b/application/views/license.php
new file mode 100644
index 0000000..ee2daa3
--- /dev/null
+++ b/application/views/license.php
@@ -0,0 +1,40 @@
+<?php $this->load->view('header'); ?>
+
+<div id="content">
+
+	<div class="title">
+		<h2><?=_('License');?></h2>
+	</div>
+
+	<div class="box">
+		<h3>This application is licensed under the MIT License for Open Source Software</h3>
+		<p>Copyright (c) 2011 Karsten Heiken, Eike Foken</p>
+
+		<p>
+			Permission is hereby granted, free of charge, to any person obtaining<br />
+			a copy of this software and associated documentation files (the "Software"),<br />
+			to deal in the Software without restriction, including without limitation<br />
+			the rights to use, copy, modify, merge, publish, distribute, sublicense,<br />
+			and/or sell copies of the Software, and to permit persons to whom the Software<br /> 
+			is furnished to do so, subject to the following conditions:
+		</p>
+
+		<p>
+			The above copyright notice and this permission notice shall be included in all<br />
+			copies or substantial portions of the Software.
+		</p>
+
+		<p>
+			THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,<br />
+			EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES<br />
+			OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND<br />
+			NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT<br />
+			HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,<br />
+			WHETHER IN AN ACTION OF	CONTRACT, TORT OR OTHERWISE, ARISING<br />
+			FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE	OR THE USE OR <br />
+			OTHER DEALINGS IN THE SOFTWARE.
+		</p>
+	</div>
+</div>
+
+<?php $this->load->view('footer'); ?>