Merge branch 'master' of disposed.de:scattport

application/controllers/ajax.php

@@ -46,4 +46,13 @@ class Ajax extends MY_Controller {
 		$tpl['messages'] = $this->messages->get();
 		$this->load->view('global/notifications', $tpl);
 	}
+
+	/**
+	 * Saves a projects description.
+	 */
+	public function save_project() {
+		$this->load->model('project');
+		$data['description'] = $this->input->post('content');
+		$this->project->update($this->session->userdata('active_project'), $data);
+	}
 }

application/models/project.php

@@ -35,8 +35,7 @@ class Project extends CI_Model {
 	 * @return array The user's projects.
 	 */
 	public function getOwn() {
-		// TODO: Session: $query = $this->db->where(array('owner' => $this->session->userdata('user_id')))
+		$query = $this->db->where(array('owner' => $this->session->userdata('user_id')))
-		$query = $this->db->where(array('owner' => '215cd70f310ae6ae'))
 				->order_by('lastaccess', 'desc')
 				->get('projects');
 		return $query->result_array();
@@ -91,8 +90,6 @@ class Project extends CI_Model {
 				->join('users', 'users.id = projects.owner', 'left')
 				->get('projects')->result_array();
 
-
-
 		return $result;
 	}
 
@@ -155,19 +152,33 @@ class Project extends CI_Model {
 		} while ($this->db->where('id', $data['id'])->from('projects')->count_all_results() > 0);
 
 
-		if($this->db->insert('projects', $data))
+		if ($this->db->insert('projects', $data)) {
 			return $data['id'];
-		else
+		} else {
 			return FALSE;
 		}
+	}
 
 	/**
-	 * Delete a project.
+	 * Updates a project.
+	 *
+	 * @param integer $projectId The ID of the project to update
+	 * @param array $data Array with data to update
+	 */
+	public function update($projectId, $data) {
+		return $this->db->where('id', $projectId)->update('projects', $data);
+	}
+
+	/**
+	 * Deletes a project.
 	 *
 	 * There is no security check in here to verify if the user has the
 	 * rights to do so. This needs to be done in the controller!
+	 *
+	 * @param integer $projectId The ID of the project to delete
 	 */
-	public function delete($project_id) {
+	public function delete($projectId) {
-		return $this->db->delete('projects', array('id' => $project_id));
+		return $this->db->delete('projects', array('id' => $projectId));
 	}
+
 }

application/views/project/detail.php

@@ -7,6 +7,9 @@
   </div>
 
   <div class="box">
+    <h3>Beschreibung</h3>
+    <div class="editInPlace"><?=nl2br($project['description']);?></div>
+    <p></p>
     <h3>Versuche</h3>
     <table class="tableList">
       <thead>
@@ -17,32 +20,27 @@
         </tr>
       </thead>
       <tbody>
-<?
+      <?php if (count($trials) > 0):?>
-	if(count($trials) > 0):
+      <?php foreach($trials as $trial):?>
-		foreach($trials as $trial):
-?>
         <tr>
           <td><a href="<?=site_url('trials/'.$trial['id'])?>"title="Versuch &quot;<?=$trial['name']?>&quot; anzeigen"><?=$trial['name']?></a></td>
           <td><span class="active">Erfolgreich abgeschlossen</span></td>
           <td>
             <a href="<?=site_url('trials/results/'.$trial['id'])?>" title="Ergebnisse zum Versuch &quot;<?=$trial['name']?>&quot; anzeigen">Ergebnisse anzeigen</a> |
             <a href="<?=site_url('trials/edit/'.$trial['id'])?>" title="Versuch &quot;<?=$trial['name']?>&quot; bearbeiten">Bearbeiten</a> |
-						<a href="<?=site_url('trials/delete/'.$trial['id'])?>" title="Versuch &quot;<?=$trial['name']?>&quot; entfernen">Entfernen</a></td>
+            <a href="<?=site_url('trials/delete/'.$trial['id'])?>" title="Versuch &quot;<?=$trial['name']?>&quot; entfernen">Entfernen</a>
+          </td>
         </tr>
-<?
+      <?php endforeach;?>
-		endforeach;
+      <?php else:?>
-	else:
-?>
         <tr>
           <td colspan="3">Keine Versuche vorhanden.</td>
         </tr>
-<?
+      <?php endif;?>
-	endif;
-?>
       </tbody>
     </table>
 
-		<p><a class="button add" href="<?=site_url('trials/create/'.$project['id'])?>">Neuen Versuch erstellen</a>
+    <p><a class="button add" href="<?=site_url('trials/create/'.$project['id'])?>">Neuen Versuch erstellen</a></p>
   </div>
 
   <div class="title">
@@ -59,27 +57,22 @@
         </tr>
       </thead>
       <tbody>
-<?
+      <?php if(count($jobsDone) > 0):?>
-	if(count($jobsDone) > 0):
+      <?php foreach($jobsDone as $job):?>
-		foreach($jobsDone as $job):
-?>
         <tr>
           <td>Versuchsname</td>
           <td>Heute, 09:32</td>
           <td>
             <a href="<?=site_url('trials/results/'.$trial['id'])?>" title="Ergebnisse zum Versuch &quot;<?=$trial['name']?>&quot; anzeigen">Ergebnisse anzeigen</a> |
-						<a href="<?=site_url('trials/edit/'.$trial['id'])?>" title="Versuch &quot;<?=$trial['name']?>&quot; bearbeiten">Bearbeiten</a></td>
+            <a href="<?=site_url('trials/edit/'.$trial['id'])?>" title="Versuch &quot;<?=$trial['name']?>&quot; bearbeiten">Bearbeiten</a>
+          </td>
         </tr>
-<?
+      <?php endforeach;?>
-		endforeach;
+      <?php else:?>
-	else:
-?>
         <tr>
           <td colspan="3">Es wurden noch keine Berechnungen durchgeführt.</td>
         </tr>
-<?
+      <?php endif;?>
-	endif;
-?>
       </tbody>
     </table>
   </div>

application/views/project/list.php

@@ -1,4 +1,4 @@
-<?php $this->load->view('header'); ?>
+<?php $this->load->view('header');?>
 
 <div id="content">
 
@@ -18,18 +18,14 @@
         </tr>
       </thead>
       <tbody>
-		<?
+      <?php foreach($projects as $project):?>
-			foreach($projects as $project):
-		?>
         <tr>
           <td><a href="<?=site_url('projects/detail/' . $project['id'])?>"><abbr title="<?=$project['description']?>"><?=$project['name']?></abbr></a></td>
           <td><?=$project['firstname'] . " " . $project['lastname']?></td>
           <td><span class="active">Erfolgreich abgeschlossen</span></td>
           <td><a href="#">Ergebnisse anzeigen</a> | <?=anchor('projects/delete/' . $project['id'], "Entfernen");?></td>
         </tr>
-		<?
+      <?php endforeach;?>
-			endforeach;
-		?>
         <tr>
           <td><a href="#"><abbr title="Beschreibung des Projekts">Blutkörperchen</abbr></a></td>
           <td>Karsten Heiken</td>
@@ -72,4 +68,4 @@
 
 </div>
 
-<?php $this->load->view('footer'); ?>
+<?php $this->load->view('footer');?>

assets/css/style.css

@@ -48,6 +48,10 @@ li { margin-left: 20px;}
 	color: #222;
 }
 
+.editable {
+    background: #fffbcc;
+}
+
 .clear { clear:both;}
 
 /* Header */
@@ -359,11 +363,11 @@ a.supersize {
     padding: 15px 20px;
 }
 a.save {
-    background: url(../images/button-sprite.png) 10px 9px no-repeat #f3f3f3;
+    background: url(../images/icons/tick.png) 10px center no-repeat #f3f3f3;
     padding-left: 30px;
 }
 a.add {
-    background: url(../images/button-sprite.png)  10px -25px no-repeat #f3f3f3;
+    background: url(../images/icons/plus-circle.png) 10px center no-repeat #f3f3f3;
     padding-left: 30px;
 }
 a.delete {
@@ -374,6 +378,10 @@ a.flag {
     background: url(../images/button-sprite.png)  10px -94px no-repeat #f3f3f3;
     padding-left: 30px;
 }
+a.cancel {
+    background: url(../images/icons/slash.png) 10px center no-repeat #f3f3f3;
+    padding-left: 30px;
+}
 a.up {
     background: url(../images/button-sprite.png)  13px -131px no-repeat #f3f3f3;
     width: 18px;

assets/js/scattport.js

@@ -1,17 +1,62 @@
-function get_notifications() {
+/**
+ *
+ */
+function getNotifications() {
 	$.get(SITE_URL + 'ajax/get_notifications', function(data) {
-		if(data.length > 0) {
+		if (data.length > 0) {
 			$('#notifications').append(data).slideDown();
 		}
 	});
 }
 
+/**
+ * Saves the changes done by in-place edit.
+ *
+ * @param obj
+ * @param cancel
+ */
+function saveChanges(obj, cancel) {
+	var a;
+
+	if (!cancel) {
+		a = $(obj).parent().siblings(0).val();
+		$.post(SITE_URL + 'ajax/save_project', { content: a }, function(response) {
+			alert("Die Änderungen wurden gespeichert.");
+		});
+	} else {
+		a = cancel;
+	}
+
+	$(obj).parent().parent().after('<div class="editInPlace">' + a + '</div>').remove();
+}
+
+/**
+ * Alternates the table rows.
+ */
 $.fn.alternateRowColors = function() {
 	$('tbody tr:odd', this).removeClass('even').addClass('odd');
 	$('tbody tr:even', this).removeClass('odd').addClass('even');
 	return this;
 };
 
+/**
+ * Replaces html line breaks with newlines.
+ */
+$.fn.br2nl = function() {
+	return $(this).html().replace(/(<br>)|(<br \/>)|(<p>)|(<\/p>)/g, "");
+};
+
+/**
+ * Similar to PHP's nl2br function.
+ */
+$.fn.nl2br = function() {
+	var breakTag = (is_xhtml || typeof is_xhtml === 'undefined') ? '<br />' : '<br>';
+	return $(this).html().replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ breakTag +'$2');
+};
+
+/*
+ * Tabs
+ */
 $(document).ready(function() {
 	$(".tab_content").hide(); // hide all content
 	$("ul.tabs li:first").addClass("active").show(); // activate first tab
@@ -30,14 +75,17 @@ $(document).ready(function() {
 	});
 
 	$('#notifications').hide();
-	get_notifications();
+	getNotifications();
-	setInterval('get_notifications()', '5000');
+	setInterval('getNotifications()', '5000');
 });
 
-/*
+/**
- * Tables
+ * Do some stuff if document is ready.
  */
 $(document).ready(function() {
+	/*
+	 * Tables
+	 */
 	var settings = {
 			table_class : 'tableList'
 	};
@@ -101,4 +149,26 @@ $(document).ready(function() {
 
 		table.trigger('repaginate');
 	});
+
+	/*
+	 * In-place editor
+	 */
+	$('.editInPlace').click(function() {
+		var textarea = '<div><textarea rows="6" cols="60">' + $(this).br2nl() + '</textarea><p></p>';
+		var button = '<p><a class="button save" href="javascript:void(0);">Speichern</a> <a class="button cancel" href="javascript:void(0);">Abbrechen</a></div>';
+		var revert = $(this).html();
+
+		$(this).after(textarea + button).remove();
+
+		$('.save').click(function() {
+			saveChanges(this, false);
+		});
+		$('.cancel').click(function() {
+			saveChanges(this, revert);
+		});
+	}).mouseover(function() {
+		$(this).addClass('editable');
+	}).mouseout(function() {
+		$(this).removeClass('editable');
+	});
 });