Merge branch 'master' of disposed.de:scattport

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 */

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 */

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'); ?>

application/views/auth/login.php

@@ -6,12 +6,12 @@
 
 <title>ScattPort | <?=_('Login');?></title>
 
-<?= link_tag('assets/css/login.css'); ?>
+<?=asset('css', 'login.css');?>
-<?= link_tag('assets/css/form.css'); ?>
+<?=asset('css', 'form.css');?>
 
-<?= script_tag('assets/js/minmax.js'); ?>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" language="javascript" type="text/javascript"></script>
-<?= script_tag('https://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js'); ?>
+<?=asset('js', 'assets/js/minmax.js');?>
-<?= script_tag('assets/js/scattport.js'); ?>
+<?=asset('js', 'assets/js/scattport.js');?>
 <script type="text/javascript">
 	var SITE_URL = '<?=site_url()?>';
 </script>

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));?>

application/views/header.php

@@ -19,8 +19,8 @@
 <?=js_asset('jtip.js');?>
 
 <script type="text/javascript">
-	var SITE_URL = '<?=site_url();?>';
+	var SITE_URL = '<?=site_url("/");?>';
-	var BASE_URL = '<?=base_url();?>';
+	var BASE_URL = '<?=base_url("/");?>';
 </script>
 
 </head>
@@ -69,7 +69,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>
@@ -77,7 +77,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>
@@ -92,7 +92,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
@@ -105,13 +105,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>
@@ -127,7 +127,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>
 

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'); ?>

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;
 }
 

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