update to brunch 1.3.1

ninoseki · Jul 1, 2012 · da0e709 · da0e709
1 parent 302c7e7
commit da0e709
Show file tree

Hide file tree

Showing 19 changed files with 1,904 additions and 1,253 deletions.
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,26 @@
+# Numerous always-ignore extensions
+*.diff
+*.err
+*.orig
+*.log
+*.rej
+*.swo
+*.swp
+*.vi
+*~
+*.sass-cache
+
+# OS or Editor folders
+.DS_Store
+.cache
+.project
+.settings
+.tmproj
+nbproject
+Thumbs.db
+
+# NPM packages folder.
+node_modules/
+
+# Brunch folder for temporary files.
+tmp/
diff --git a/app/views/column_view.coffee b/app/views/column_view.coffee
@@ -1,4 +1,4 @@
-columnTemplate = require('./templates/column')
+columnTemplate = require('views/templates/column')
 
 class exports.ColumnView extends Backbone.View
   className: "column"

diff --git a/app/views/columns_view.coffee b/app/views/columns_view.coffee
@@ -1,5 +1,5 @@
 {ColumnView} = require('views/column_view')
-columnsTemplate = require('./templates/columns')
+columnsTemplate = require('views/templates/columns')
 
 class exports.ColumnsView extends Backbone.View
   id: "columns"

diff --git a/app/views/home_view.coffee b/app/views/home_view.coffee
@@ -1,4 +1,4 @@
-homeTemplate = require('./templates/home')
+homeTemplate = require('views/templates/home')
 
 class exports.HomeView extends Backbone.View
   el: '#main'

diff --git a/app/views/new_column_view.coffee b/app/views/new_column_view.coffee
@@ -1,4 +1,4 @@
-newColumnTemplate = require('./templates/new_column')
+newColumnTemplate = require('views/templates/new_column')
 
 class exports.NewColumnView extends Backbone.View
   id: "new-column"

diff --git a/app/views/new_note_view.coffee b/app/views/new_note_view.coffee
@@ -1,4 +1,4 @@
-newNoteTemplate = require('./templates/new_note')
+newNoteTemplate = require('views/templates/new_note')
 
 class exports.NewNoteView extends Backbone.View
   id: "new-note"

diff --git a/app/views/note_view.coffee b/app/views/note_view.coffee
@@ -1,4 +1,4 @@
-noteTemplate = require('./templates/note')
+noteTemplate = require('views/templates/note')
 
 class exports.NoteView extends Backbone.View
   className: "note white"

diff --git a/app/views/notes_view.coffee b/app/views/notes_view.coffee
@@ -1,5 +1,5 @@
 {NoteView} = require('views/note_view')
-notesTemplate = require('./templates/notes')
+notesTemplate = require('views/templates/notes')
 
 class exports.NotesView extends Backbone.View
   id: "notes"

diff --git a/app/views/resting_view.coffee b/app/views/resting_view.coffee
@@ -1,4 +1,4 @@
-timerTemplate = require('./templates/timer')
+timerTemplate = require('views/templates/timer')
 
 class exports.RestingView extends Backbone.View
   el: "#modal"

diff --git a/app/views/stats_view.coffee b/app/views/stats_view.coffee
@@ -1,4 +1,4 @@
-statsTemplate = require('./templates/stats')
+statsTemplate = require('views/templates/stats')
 
 class exports.StatsView extends Backbone.View
   el: "#modal"

diff --git a/app/views/working_view.coffee b/app/views/working_view.coffee
@@ -1,4 +1,4 @@
-timerTemplate = require('./templates/timer')
+timerTemplate = require('views/templates/timer')
 
 class exports.WorkingView extends Backbone.View
   el: "#modal"

diff --git a/build/index.html b/build/index.html
@@ -22,10 +22,10 @@
                     <a href="#working">
                         <button id="start-pomodoro" class="btn primary">Start Pomodoro</button>
                     </a>
-                    <a href="#resting/300">
+                    <a href="#resting/short">
                         <button id="take-a-short-break" class="btn success">Take a short break</button>
                     </a>
-                    <a href="#resting/900">
+                    <a href="#resting/long">
                         <button id="take-a-long-break" class="btn success">Take a long break</button>
                     </a>
                 </span>
@@ -34,6 +34,11 @@
                         <button class="btn">Show stats</button>
                     </a>
                 </span>
+                <span id="small_timer_container" style="margin-left: 5px">
+                    <a href="#small_timer">
+                        <button id="small_timer" class="btn success">Timer</button>
+                    </a>
+                </span>
             </div>
         </div>
     </div>

diff --git a/build/options.html b/build/options.html
@@ -0,0 +1,46 @@
+<html>
+<head><title>Pomodoro Daisuki</title></head>
+<script type="text/javascript">
+
+function save_parameter(name){
+	var input = document.getElementById(name);
+	localStorage[name] = input.value;
+}
+
+function load_parameter(name){
+	var value = localStorage[name];
+	if (!value) {
+		return;
+	}
+	var input = document.getElementById(name);
+	input.value = value;
+}
+
+function save_options() {
+	save_parameter("pomodoro-duration");
+	save_parameter("short-duration");
+	save_parameter("long-duration");
+
+	var status = document.getElementById("status");
+	status.innerHTML = "Options Saved.";
+	setTimeout(function() {
+		status.innerHTML = "";
+	}, 750);
+}
+
+function restore_options() {
+	load_parameter("pomodoro-duration");
+	load_parameter("short-duration");
+	load_parameter("long-duration");
+}
+</script>
+
+<body onload="restore_options()">
+<table>
+<tr><td>Duration of a pomodoro </td><td><input id="pomodoro-duration" size=2 value="25" /></td><td>minutes</td></tr>
+<tr><td>Duration of a short break </td><td><input id="short-duration" size=2 value="5" /></td><td>minutes</td></tr>
+<tr><td>Duration of a long break </td><td><input id="long-duration" size=2 value="15"/></td><td>minutes</td></tr>
+</table>
+<button onclick="save_options()">Save</button> <span id="status"></span>
+</body>
+</html>