Changeset 976

Timestamp:

11/07/08 19:00:00 (2 months ago)

Author:

lucy

Message:

added some persistant ajax kind of state to filters. really need better framework, though. maybe use of # instead, with javascript doing everything, rather than putting stuff in GET parameters and getting the server and template involved

Location:

huginmunin/trunk/web/hm/app

Files:

• media/css/general.css (modified) (1 diff)
• media/js/main.js (modified) (4 diffs)
• templates/base.html (modified) (1 diff)
• templates/browse_extension.html (modified) (1 diff)
• templates/forms/object_form.html (modified) (1 diff)
• templates/graph/list.html (modified) (2 diffs)
• views/main.py (modified) (3 diffs)

huginmunin/trunk/web/hm/app/media/css/general.css

@@ -717 +717 @@
 
 /****** BROWSE REVIEWS ******/
-#add_node { text-align: center; }
+#add_node input { float: right; }
+#add_node { margin-bottom: 10px; }
+#add_node table th label { float: right; padding-right: 1em; }
+#add_node table td input { float: left; }
+#add_node .ajax_button { text-align: right; }
 
 #list_of_nodes .node { 

huginmunin/trunk/web/hm/app/media/js/main.js

@@ -447 +447 @@
                 function (responseText, textStatus, XMLHttpRequest) {
                         textarea_to_rte(container);
+                        if (container.indexOf('add_node') > -1) {
+                                location.href = remove_get_parameter('add_node', location.href)
+                        }
                 }
         );
@@ -458 +461 @@
 ///
 function cancel_form(cancel_url, container, template) {
-        $("#"+container).load(
-                        cancel_url+'?container='+container+'&template='+template
-        );
+        if (container.indexOf('add_node') > -1) {
+                location.href = remove_get_parameter('add_node', location.href)
+        } else {
+                $("#"+container).load(
+                                cancel_url+'?container='+container+'&template='+template
+                );
+        }
 }
 
@@ -497 +504 @@
 function dropdown_submit(key, select) {
     var val = (select.options[select.selectedIndex].value);
-    get_paramter_submit(key, val);
+    get_parameter_submit(key, val);
 }
 ///
 /// Adjust GET parameters based on key and value and submit.
 ///
-function get_paramter_submit(key, val) {
+function get_parameter_submit(key, val) {
     if (val) {
             new_location = location.href;
@@ -522 +529 @@
 ///
 function remove_get_parameter(key, loc) {
+        if (!loc) { loc = location.href; }
         two_parts = loc.split("?");
         // two_parts = /Main/foo, key=val&k2=v2

huginmunin/trunk/web/hm/app/templates/base.html

@@ -90 +90 @@
         <script type="text/javascript">
                 $(document).ready(function() {
-                        $(".expanding_area, .contract_button").hide();
+                        {% if show_controls %}
+                                $(".expand_button").hide();
+                        {% else %}
+                                $(".expanding_area, .contract_button").hide();
+                        {% endif %}
+                        {% if show_add_node %}
+                                $("#add_node input").click();
+                        {% endif %}
+                        
                         $(".expand_button, .contract_button").css("cursor", "pointer");
         <!-- This script shows the area when "expand_button" is clicked-->

huginmunin/trunk/web/hm/app/templates/browse_extension.html

@@ -24 +24 @@
 <div class="menu_overall">
         <ul>
-                <li> <a href="{% url coming_soon %}">Browse List</A> <span class="coming_soon">(coming soon)</span></li>
+                <li> <a href="{% url browse %}">Browse List</A></li>
                 <li> <a href="{% url coming_soon %}">Keyword Search</A> <span class="coming_soon">(coming soon)</span></li>
                 <li> <a href="{% url coming_soon %}">My Recently Viewed</A> <span class="coming_soon">(coming soon)</span></li>
-                <li> <a href="{% url coming_soon %}">Add Listing</A> <span class="coming_soon">(coming soon)</span></li>
+                <li> <a href="{% url browse %}?add_node=yes">Add Listing</A></li>
                 <li> <a href="{% url coming_soon %}">Notepad</A> <span class="coming_soon">(coming soon)</span></li>
         </ul>

huginmunin/trunk/web/hm/app/templates/forms/object_form.html

@@ -3 +3 @@
         <TABLE>
                 {{ form }}
-                <INPUT 
-                        TYPE="button"
-                        onClick="replace_form('{{ action_url }}', '{{ container }}', '{{ template }}' );"
-                        VALUE="Save"
-                        class="ajax_button save"
-                />
-                <INPUT
-                        TYPE="button"
-                        onClick="cancel_form('{{ cancel_url }}', '{{ container }}', '{{ template }}');"
-                        VALUE="Cancel"
-                        class="ajax_button cancel"
-                />
         </TABLE>
+        <INPUT 
+                TYPE="button"
+                onClick="replace_form('{{ action_url }}', '{{ container }}', '{{ template }}' );"
+                VALUE="Save"
+                class="ajax_button save"
+        />
+        <INPUT
+                TYPE="button"
+                onClick="cancel_form('{{ cancel_url }}', '{{ container }}', '{{ template }}');"
+                VALUE="Cancel"
+                class="ajax_button cancel"
+        />
 </FORM>

huginmunin/trunk/web/hm/app/templates/graph/list.html

@@ -15 +15 @@
         </div>
         <div class="expanding_area"><br>
-                        <DIV id="add_node" class="control_item float_right">
+                        <DIV id="add_node" class="control_item">
                                 {% if user.is_authenticated %}
                                         {% include 'graph/node_add.html' %}
@@ -55 +55 @@
                                         View by name: 
                                         {% for letter in letters %}
-                                                <SPAN class="letter {% ifequal selected_letter letter %}selected{% endifequal %}" onClick="get_paramter_submit('filter_by_letter', '{{ letter }}');">{{ letter }}</SPAN>
+                                                <SPAN class="letter {% ifequal selected_letter letter %}selected{% endifequal %}" onClick="get_parameter_submit('filter_by_letter', '{{ letter }}');">{{ letter }}</SPAN>
                                         {% endfor %}
                                         <SPAN class="letter {% ifequal selected_letter "none" %}selected {% endifequal %}" onClick="location.href = remove_get_parameter('filter_by_letter');">(View All)</SPAN>

huginmunin/trunk/web/hm/app/views/main.py

@@ -325 +325 @@
 #TagsJSON = JSON_API([['id','tag','count']])
 
+def pluralize(word):
+    if word[-1] == 'y':
+        return "%sies" % word[:-1]
+    else:
+        return "%ss" % word
 
 def graph_centric(request):
     params = run_params(request.GET)
     nodes = Node.find().select_related().order_by('label')
-    
     order = 'alphabetical'
     
@@ -339 +343 @@
         selected_type = int(filter_by_type)
         selected_type_label = (NodeType.get(selected_type)).label
-        viewed_items_title.append("%ss" % selected_type_label)
+        viewed_items_title.append(pluralize(selected_type_label))
         nodes = nodes.filter(nodetypecast__type__id__in=filter_by_type)
 
@@ -368 +372 @@
         viewed_items_title = "View All"
     else:
+        show_controls = True
         viewed_items_title = "View " + ' '.join(viewed_items_title)
+    
+    if 'add_node' in params:
+        show_controls = True
+        show_add_node = True
     
     types = NodeType.objects.all().order_by('label')