Merge branch 'master' of github.com:IKS/Proggis

IKS · Sep 22, 2011 · 55067cd · 55067cd
2 parents 34544ee + ef5e512
commit 55067cd
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 12 deletions.
diff --git a/_attachments/dialogs/uploadSpreadsheet.html b/_attachments/dialogs/uploadSpreadsheet.html
@@ -1,10 +1,27 @@
 <div class="msg"></div>
 <form id="upload" method="POST" submit="">
-    Select the workflow to start: <select id="workflowSelector">
-        <option value="EffortControlling">Effort controlling sheet</option>
-        <option value="Deliverables">Deliverables document</option>
-    </select>
-    <input name="_attachments" filename="asdf.asdf" type="file" />
+    <table>
+        <tr>
+            <td>
+                Select the workflow to start: 
+            </td>
+            <td>
+                <select id="workflowSelector">
+                    <option value="EffortControlling">Effort controlling sheet</option>
+                    <option value="Deliverables">Deliverables document</option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                Attachments: 
+            </td>
+            <td>
+                <input name="_attachments" type="file" />
+            </td>
+        </tr>
+    </table>
     <input type="hidden" name="_rev" value="">
+    <br/><br/>
     <input type="submit" />
 </form>
diff --git a/_attachments/index.html b/_attachments/index.html
@@ -40,7 +40,7 @@
                 <nav>
                     <ul>
                         <li><a id="importSpreadsheetButton">Import data</a></li>
-                        <li><a href="#">Request data</a></li>
+                        <li><a>Request data</a></li>
                     </ul>
                 </nav>
                 <h1 id="viewName">Proggis view name</h1>

diff --git a/_attachments/js/actions.coffee b/_attachments/js/actions.coffee
@@ -11,7 +11,7 @@ jQuery(document).ready ->
             form = jQuery "#upload", dialogEl
 
             jQuery('.uploadSpreadsheet').dialog
-                width: 400
+                width: 550
                 close: ->
                     jQuery('.uploadSpreadsheet').dialog "destroy"
                     jQuery('.uploadSpreadsheet').remove()

diff --git a/_attachments/js/proggis.coffee b/_attachments/js/proggis.coffee
@@ -5,6 +5,9 @@ Proggis.showEditableDescription = (route) ->
     switch route
         when "route:execution"
             console.log "no editable description for", route
+        when "route:home"
+            Proggis.description.attr "route", route
+            Proggis.description.html "Interactive Knowledge Stack (IKS) is an open source community, whose projects are focused on building an open and flexible technology platform for semantically enhanced Content Management Systems (CMS)."
         else
             Proggis.description.attr "route", route
             Proggis.description.html "The default editable text..."

diff --git a/_attachments/js/router.coffee b/_attachments/js/router.coffee
@@ -15,7 +15,7 @@ Proggis.RouterClass = Backbone.Router.extend
         "execution/:execId/": "execution"
 
     home: ->
-        Proggis.viewName.html "Dashboard"
+        Proggis.viewName.html "IKS Project controlling Dashboard"
         Proggis.graph.hide()
         Proggis.Chart.init "AreaChart", (node) ->
         Proggis.Chart.legendClear $(".legend")

diff --git a/lists/tables.coffee b/lists/tables.coffee
@@ -94,10 +94,7 @@
             about: "_id"
             fields: [
                 key: "name"
-                label: "Titel"
-            ,
-                key: "_id"
-                label: "Uri"
+                label: "Title"
             ,
                 key: "description"
                 label: "Description"