Full Journal View. Store last view.

llaske · Dec 16, 2013 · 7888d5c · 7888d5c
1 parent 3deb83d
commit 7888d5c
Show file tree

Hide file tree

Showing 8 changed files with 101 additions and 18 deletions.
diff --git a/config.xml b/config.xml
@@ -3,10 +3,10 @@
         xmlns:gap = "http://phonegap.com/ns/1.0"
         id        = "org.olpc-france.sugarweb"
         version   = "1.0.0">
-    <name>Sugar Web</name>
+    <name>Sugarizer</name>
 
     <description>
-        A taste of the Sugar Learning platform in a small app.
+        A taste of the Sugar on any device.
     </description>
 
     <author href="http://olpc-france.org" email="[email protected]">

diff --git a/css/styles.css b/css/styles.css
@@ -13,10 +13,48 @@ input {
 
 #main-toolbar #view-radial-button {
 	background-image: url(../icons/view-radial.svg);
+	position: absolute;
+	top: 0px;
+	right: 90px;
 }
 
 #main-toolbar #view-list-button {
 	background-image: url(../icons/view-list.svg);
+	position: absolute;
+	top: 0px;
+	right: 30px;
+}
+
+#main-toolbar #favorite-button {
+	background-image: url(../icons/emblem-favorite.svg);
+	position: absolute;
+	top: 0px;
+	left: 530px;
+}
+
+#main-toolbar #view-desktop-button {
+	background-image: url(../icons/view-radial.svg);
+	position: absolute;
+	top: 0px;
+	right: 30px;
+}
+
+#homeSearch {
+	width: 300px;
+}
+
+#journalSearch {
+	width: 450px;
+}
+
+#journalType {
+	margin-left: 70px;
+	width: 170px;
+}
+
+#journalTime {
+	margin-left: 10px;
+	width: 130px;
 }
 
 .web-activity {

diff --git a/index.html b/index.html
@@ -3,7 +3,7 @@
 
   <head>
     <meta charset="utf-8" />
-    <title>Sugar WebUI</title>
+    <title>Sugarizer</title>
 
 	<!-- Sugar Framework -->
     <link rel="stylesheet" href="lib/sugar-web/graphics/css/sugar.css">
@@ -27,15 +27,27 @@
   </head>
 
   <body>
-	<!-- Desktop toolbar -->
+	<!-- Toolbars -->
     <div id="main-toolbar" class="toolbar">
         <div class="row">
-			<input type="text" id="title">
-			<button class="toolbutton pull-right" id="view-list-button" title="List"></button>					
-			<button class="toolbutton pull-right" id="view-radial-button" title="Home"></button>					
+			<table width="100%">
+				<!-- Desktop toolbar -->
+				<tr id="desktopToolbar"><td>
+					<input type="text" id="homeSearch">
+					<button class="toolbutton" id="view-list-button" title="List"></button>					
+					<button class="toolbutton" id="view-radial-button" title="Home"></button>					
+				</td></tr>
+				<!-- Journal toolbar -->
+				<tr id="journalToolbar" style="display: none;"><td>
+					<input type="text" id="journalSearch">
+					<button class="toolbutton" id="favorite-button" title="Filter favorite"></button>				
+					<button class="toolbutton" id="view-desktop-button" title="Home"></button>	
+					<input type="text" id="journalType">
+					<input type="text" id="journalTime">
+
+				</td></tr>
+			</table>
 		</div>
-
-
     </div>
 
     <!-- The content of the desktop goes inside the canvas -->

diff --git a/js/app.js b/js/app.js
@@ -22,6 +22,7 @@ define(function (require) {
 		);
 		document.getElementById("view-radial-button").onclick = function() { app.showView(constant.radialView); };
 		document.getElementById("view-list-button").onclick = function() { app.showView(constant.listView); };
+		document.getElementById("view-desktop-button").onclick = function() { app.showView(constant.radialView); };
         app.renderInto(document.getElementById("canvas"));
     });
 

diff --git a/js/homeview.js b/js/homeview.js
@@ -27,25 +27,24 @@ enyo.kind({
 	create: function() {
 		// Init screen
 		this.inherited(arguments);
-		this.currentView = constant.radialView;
 		this.timer = null;
 		var that = this;
 		document.onmousemove = function(e) {
 			that.position = {x: e.pageX, y: e.pageY};
 		}
-
-		// Get activities from local storage or from init web service
-		if (preferences.getActivities() == null) {
-			this.$.activities.send();
-		} else {
-			this.init();
-		}
 
 		// Load and sort journal
 		this.journal = datastore.find();
 		this.journal = this.journal.sort(function(e0, e1) {
 			return parseInt(e1.metadata.timestamp) - parseInt(e0.metadata.timestamp); 
 		});
+
+		// Get activities from local storage or from init web service
+		if (preferences.getActivities() == null) {
+			this.$.activities.send();
+		} else {
+			this.init();
+		}
 	},
 
 	// Init web service response, redraw screen
@@ -62,6 +61,9 @@ enyo.kind({
 
 	// Init desktop
 	init: function() {
+		this.currentView = constant.radialView;
+		if (preferences.getView())
+			this.showView(preferences.getView());	
 		this.draw();
 	},
 
@@ -117,6 +119,7 @@ enyo.kind({
 
 		// Show desktop
 		if (newView == constant.radialView) {
+			util.setToolbarVisibility({desktopToolbar: true, journalToolbar: false});
 			this.$.otherview.hide();
 			this.$.desktop.show();
 			this.$.owner.show();
@@ -133,6 +136,7 @@ enyo.kind({
 
 		// Show list
 		if (newView == constant.listView) {
+			util.setToolbarVisibility({desktopToolbar: true, journalToolbar: false});		
 			this.$.otherview.createComponent({kind: "Sugar.Desktop.ListView", count: preferences.getActivities().length});
 		}
 
@@ -142,13 +146,18 @@ enyo.kind({
 				this.$.activityPopup.hidePopup();
 				window.clearInterval(this.timer);
 			}	
+			util.setToolbarVisibility({desktopToolbar: false, journalToolbar: true});
 			this.$.otherview.createComponent({kind: "Sugar.Journal", journal: this.journal});
 		}
 
 		this.$.otherview.show();
 		this.$.otherview.render();		
 	},
 
+	getView: function() {
+		return this.currentView;
+	},
+
 	clearView: function() {
 		var controls = this.$.otherview.getControls();
 		for (var i = 0, c; c = controls[i]; i++) c.destroy();	

diff --git a/js/journal.js b/js/journal.js
@@ -70,6 +70,7 @@ enyo.kind({
 			this.journal[inEvent.index].metadata.keep = (keep + 1) % 2;
 		var ds = new datastore.DatastoreObject(objectId);
 		ds.setMetadata(this.journal[inEvent.index].metadata);
+		ds.setDataAsText(this.journal[inEvent.index].text);
 		ds.save();
 		inSender.setColorized(this.journal[inEvent.index].metadata.keep == 1);
 		this.render();

diff --git a/lib/settings.js b/lib/settings.js
@@ -9,6 +9,7 @@ define(["sugar-web/datastore"], function (datastore) {
 	settings.color = 22;
 	settings.colorvalue = null;
 	settings.activities = null;
+	settings.view = 0;
 
 	// Load settings from local storage
 	settings.load = function() {
@@ -19,6 +20,7 @@ define(["sugar-web/datastore"], function (datastore) {
 		this.name = preferences.name;
 		this.color = preferences.color;
 		this.colorvalue = preferences.colorvalue;
+		this.view = preferences.view;
 
 		// Load activities
 		this.activities = preferences.activities;
@@ -38,7 +40,13 @@ define(["sugar-web/datastore"], function (datastore) {
 
 	// Save settings to local storage
 	settings.save = function() {
-		datastore.localStorage.setValue('sugar_settings', {name: this.name, color: this.color, colorvalue: xoPalette.colors[this.color], activities: this.activities});	
+		datastore.localStorage.setValue('sugar_settings', {
+			name: this.name,
+			color: this.color,
+			colorvalue: xoPalette.colors[this.color],
+			activities: this.activities,
+			view: app.getView()
+		});	
 	};
 
 	// Get properties
@@ -48,6 +56,9 @@ define(["sugar-web/datastore"], function (datastore) {
 	settings.getColor = function() {
 		return xoPalette.colors[this.color];
 	};
+	settings.getView = function() {
+		return this.view;
+	};
 	settings.getActivities = function() {
 		return this.activities;
 	};

diff --git a/lib/util.js b/lib/util.js
@@ -56,5 +56,16 @@ define(function () {
 		return { x: canvas_centerx, y: canvas_centery };
 	 }
 
+	 // Show/Hide toolbar
+	 util.setToolbarVisibility = function(values) {
+		for(var key in values) {
+			var elem = document.getElementById(key);
+			if (values[key])
+				elem.style.display = "inline";
+			else
+				elem.style.display = "none";
+		} 
+	 }
+
 	 return util;
  });