Changeset 481:431c98311af8

Timestamp:

01/14/10 19:10:11 (8 months ago)

Author:

Nick Stenning <nick@…>

Branch:

default

Message:

Half-fixed factlet edit view

Location:

microfacts

Files:

• controllers/factlet.py (modified) (3 diffs)
• public/behaviour/app/controllers/factlet_edit_controller.js (modified) (5 diffs)
• public/behaviour/load.js (modified) (1 diff)
• templates/factlet/edit.html (modified) (2 diffs)
• templates/factlet/edit_core.html (modified) (1 diff)
• templates/thread/edit.html (modified) (1 diff)
• templates/util.html (modified) (1 diff)

microfacts/controllers/factlet.py

@@ -165 +165 @@
         if factlet:
             c.factlet = factlet
-            html = render('factlet/edit_core.html')
-            return html
+            return render('factlet/edit_core.html')
             
         mode = EntityGet('/factlet/%s' % id).execute()
         if mode.response_code == 200:
             c.factlet = mode.entity
-            edit_form_html = render('factlet/edit_core.html')
-            return edit_form_html
+            return render('factlet/edit_core.html')
         else:
             abort(mode.response_code)
@@ -179 +177 @@
         ispreview = request.params.has_key('preview')
         iscommit = request.params.has_key('commit')
-        if not (ispreview or iscommit):
-            edit_form_html = self.edit_core(id)
-            c.edit_form = genshi.HTML(edit_form_html)
+        
+        c.edit_core = self.edit_core(id)
+        
+        if not (iscommit or ispreview):
             return render('factlet/edit.html')
-        # so must be preview or commit ...
+        
+        
+        # works in place
+        self.unflatten_form_data(request.params)
         entity_data = dict(request.params)
-        # works in place
-        self.unflatten_form_data(entity_data)
+        
         if ispreview:
-            return self._preview(entity_data)
+            self._preview(entity_data)
+            return render('factlet/edit.html')
+            
         elif iscommit:
             mode = EntityPut('/factlet/%s' % id,
@@ -207 +210 @@
         json_data = entity_data
         c.factlet = self._parse_json_data(json_data)
-        c.factlet_html = genshi.HTML(render('factlet/read_core.html'))
-        c.factlet = self._parse_json_data(json_data)
-        c.edit_form = genshi.HTML(render('factlet/edit_core.html'))
-        return render('factlet/edit.html')
+        c.factlet_html = render('factlet/read_core.html')
 
     def unflatten_form_data(self, formdict):
         # convert back to json string format (not actual domain object)
-        # name convention follows formencode
-        x = formdict.get('location__x', None)
-        y = formdict.get('location__y', None)
-        try: x = float(x)
-        except: x = None
-        try: y = float(y)
-        except: y = None
-        if x or y:
-            formdict['location'] = {'type': 'Point', 'coordinates': [x, y] }
+        coords = formdict.getall('location[geometry][coordinates][]')
+        
+        try:
+            coords[0] = float(coords[0]) if coords[0] else None
+            coords[1] = float(coords[1]) if coords[1] else None
+            f = geojson.Feature()
+            f.geometry = geojson.Point(coordinates=coords)
+            print f
+            formdict['location'] = f
+        except:
+            pass
+        
 
     def template(self, id):

microfacts/public/behaviour/app/controllers/factlet_edit_controller.js

@@ -5 +5 @@
         this.parent(el);
         
-        // Disable as causes serious UI breakage when pane larger than page
-        // new AutoScroller(this.element).scrollIntoView();
+        // If we're not a subcontroller, set up our own resources.
+        if (!this.owner) { 
+            this.factlet = Factlet.find(this.element.getElement('.factlet').mfId()); 
+            this.factlet.attach(this.element);
+        }
 
         this.modalMap = new Modal(this.element.getElement('.factlet-location-editor'), {
@@ -14 +17 @@
             onHide: this.modalMapDidHide.bind(this)
         });
+        
+        this.element.getElement('.geometry').grab(new Element('dd', {
+            'class': 'notes',
+            'html': '<a href="#" class="locationSelectActivate">Select location on map</a>.'
+        }));
     },
         
@@ -39 +47 @@
     factletSaved: function (factlet) {
         factlet.removeEvent("resourceChange", this.saveCallback);
-        this.owner.fireEvent('factletSelect', factlet);
-        this.owner.fireEvent('factletListUpdated', factlet);
+        if (this.owner) { 
+            this.owner.fireEvent('factletSelect', factlet);
+            this.owner.fireEvent('factletListUpdated', factlet);
+        }
     },
 
@@ -61 +71 @@
     controls: {
         'form submit': function (e) {
-            e.stop();
-            this.updateFactlet(e.target.form.toObject());
+            if (this.owner) {
+                e.stop();
+                this.updateFactlet(e.target.form.toObject());
+            }
         },
         'a.locationSelectActivate click': function (e) {
@@ -91 +103 @@
     }
 });
+
+// Only set up a FactletEditController if there's no thread in the page, as
+// threads will set up their own subcontrollers.
+if (MF.environment != "test" && !$(document).getElement('.thread')) {
+    window.addEvent('domready', function () {
+        new FactletEditController($(document).getElement('.factlet-edit'));
+    });
+}

microfacts/public/behaviour/load.js

@@ -64 +64 @@
         { name: "app/controllers/factlet_search_controller" },
         { name: "app/controllers/factlet_edit_controller",
-          requires: ["lib/elementfill", "lib/autoscroller"]
+          requires: ["lib/elementfill", 
+                     "lib/autoscroller", 
+                     "app/models/factlet", 
+                     "app/controllers/map_controller"]
         },
         { name: "app/controllers/factlet_create_controller" },

microfacts/templates/factlet/edit.html

@@ -20 +20 @@
     </p>
 
-    ${c.edit_form}
+    <div class="factlet-edit">
+      ${c.edit_core}
+      ${factlet_location_editor()}
+    </div>
 
     <py:if test="c.factlet_html">
@@ -30 +33 @@
       </div>
     </py:if>
+    
+    <script type="text/javascript">
+      MF.loader.load( ['app/controllers/factlet_edit_controller'] );
+    </script>
   </body>
 </html>

microfacts/templates/factlet/edit_core.html

@@ -54 +54 @@
                      class_='coordinate', id="coord-y")}
           </dd>
-          <dd class="notes">
-            <a href="#" class="locationSelectActivate">Select location on map</a>.
-          </dd>
         </dl>
-
 
       </div>

microfacts/templates/thread/edit.html

@@ -50 +50 @@
         <div class="factlet-edit">
           ${c.edit_core}
-
-          <div class="factlet-location-editor modal" style="visibility:hidden;opacity:0">
-            <div class="modal-content">
-              <h3>Select a point.</h3>
-              <div class="map">
-                <p class="buttons">
-                  <a href="#" class="done"><img alt='' src='/images/icons/accept.png' />Done</a>
-                  <a href="#" class="cancel"><img alt='' src='/images/icons/cancel.png' />Cancel</a>
-                </p>
-              </div>
-            </div>
-          </div>
+          ${factlet_location_editor()}
         </div>
 

microfacts/templates/util.html

@@ -51 +51 @@
     <script type="text/javascript" src="http://openlayers.org/api/2.8/OpenLayers.js"></script>
   </py:def>
+  
+  <div py:def="factlet_location_editor" class="factlet-location-editor modal" style="visibility:hidden;opacity:0" >
+    <div class="modal-content">
+      <h3>Select a point.</h3>
+      <div class="map">
+        <p class="buttons">
+          <a href="#" class="done"><img alt='' src='/images/icons/accept.png' />Done</a>
+          <a href="#" class="cancel"><img alt='' src='/images/icons/cancel.png' />Cancel</a>
+        </p>
+      </div>
+    </div>
+  </div>
 </html>