Form validation implementation version 1

ploubser · Oct 19, 2010 · ac7ef91 · ac7ef91
1 parent 1603ce6
commit ac7ef91
Show file tree

Hide file tree

Showing 39 changed files with 158 additions and 208 deletions.
diff --git a/app/controllers/canvas_controller.rb b/app/controllers/canvas_controller.rb
diff --git a/app/controllers/griditems_controller.rb b/app/controllers/griditems_controller.rb
@@ -130,7 +130,6 @@ def load_board
               tmp = p.split(/:/, 2)
               @parameters[tmp[0]] = tmp[1]
             end
-            RAILS_DEFAULT_LOGGER.debug @parameters.inspect
             @position = [item.x_axis, item.y_axis]
             @state = params[:state]
             page.insert_html :bottom, :container, :partial => "item"

diff --git a/app/models/canvas.rb b/app/models/canvas.rb
diff --git a/app/views/griditems/_item.html.erb b/app/views/griditems/_item.html.erb
@@ -4,8 +4,9 @@
 
 
 <%= @parameter_list = "" %>
-<div class="item" id="item<%= @timestamp%>" style="height:<%= @dimentions[0]%>px;width:<%=@dimentions[1] %>px;border:solid 2px;postion:absolute;" onmousemove="enableEvents('item<%= @timestamp%>')" >
-    <%= render :partial => "griditems/plugins/#{@type.downcase}/#{@type.downcase}", :locals => {:parameters => @parameters}%>
+<div class="item" id="item<%= @timestamp%>" style="height:<%= @dimentions[0]%>px;width:<%=@dimentions[1] %>px;border:solid 2px;position:absolute;" onmousemove="enableEvents('item<%= @timestamp%>')" >
+    <%= render :partial => "griditems/plugins/#{@type.downcase}/#{@type.downcase}", :locals => {:parameters => @parameters, :itemid => "item" + @timestamp}%>
+    <%= javascript_tag "positionItem('item#{@timestamp}', 100 , 100)" %>
     <%= form_tag 'index' %>
     <% @parameters.each do |p| %>
         <% unless p.to_s =~/.*authenticity.*|.*action.*|.*controller.*|.*height.*|.*refresh_rate.*|.*width.*|.*create.*|.*type.*|.*title.*|.*update.*/ %>

diff --git a/app/views/griditems/edit.html.erb b/app/views/griditems/edit.html.erb
diff --git a/app/views/griditems/index.html.erb b/app/views/griditems/index.html.erb
@@ -1,6 +1,5 @@
 <%= javascript_include_tag :defaults %>
 <script src="http://www.google.com/jsapi" type="text/javascript"></script>
-<script src="http://www.google.com/uds/solutions/dynamicfeed/gfdynamicfeedcontrol.js" type="text/javascript"></script>
 
 <% javascripts = get_javascript %>
 <% javascripts.each do |javascript| %>
@@ -12,13 +11,8 @@
     <%= stylesheet_link_tag "#{stylesheet}" %>
 <% end %>
 
-<%#= stylesheet_link_tag "jquery-ui-1.8.4.custom.css" %>
-<%#= stylesheet_link_tag "bernard.css" %>
-
 <%= javascript_tag "jQuery.noConflict();" %>
 
-
-
 <div class="ui-widget ui-widget-content screen" id="screen">
 
     <div class="ui-widget-header"><center>BernardBoard</center></div>
@@ -95,8 +89,6 @@
             </div>
         </div>
     <% end %>
-
-        <div id="footer" class="footer ui-widget-header"><center>Pinetecltd - August 2010</center></div>
     </div>
 </div>
 <% unless @fullscreen.nil?%>

diff --git a/app/views/griditems/new.html.erb b/app/views/griditems/new.html.erb
diff --git a/app/views/griditems/plugins/calendar/_formfor_calendar.html.erb b/app/views/griditems/plugins/calendar/_formfor_calendar.html.erb
@@ -5,6 +5,6 @@
     User name: <%= text_field_tag "usrname", "", :size=>24 %><br>
     Password : <%= text_field_tag "passwrd" %> <bR>
     Refresh Rate (in seconds): <%= text_field_tag "refresh_rate" %> <br>
-    <%= submit_to_remote "create_grid_item", "Create", :url => {:action => "create_grid_item", :type => type}, :html => {:class => "create"}%> <br>
-    <%= submit_to_remote "update_grid_item", "Update", :url => {:action => "update_grid_item", :type => type}, :html => {:class => "update"} %>
+    <%= submit_to_remote "create_grid_item", "Create", :url => {:action => "create_grid_item", :type => type}, :html => {:class => "create"}, :condition => "validateForm()"%> <br>
+    <%= submit_to_remote "update_grid_item", "Update", :url => {:action => "update_grid_item", :type => type}, :html => {:class => "update"}, :condition => "validateForm()"%>
 <% end %>
diff --git a/app/views/griditems/plugins/feed/_feed.html.erb b/app/views/griditems/plugins/feed/_feed.html.erb
@@ -1,23 +1,27 @@
-<% feed = get_feed(@parameters["url"])%>
-
-<div class="ui-widget">
-    <div class="ui-widget-header">
-        <%= @parameters["title"] %>
-    </div>
+<% feed = get_feed(@parameters["uri"])%>
+<% if feed == "error" %>
+    <%= javascript_tag "alert('Could not create Feed item. Please check if the feed url is correct.')"%>
+    <%= javascript_tag "jQuery('##{itemid}').remove();" %>
+<% else %>
+    <div class="ui-widget">
+        <div class="ui-widget-header">
+            <%= @parameters["title"] %>
+        </div>
 
-    <% feed.items.each_with_index do |topic,i| %>
-        <div id="feed<%=i%>" class="feed" style="display:none;">
-            <div id="feed-header<%=i%>" 
-                <%= image_tag "rss_icon.gif", :html => {"align" => "left"}%>
-                <%= topic.title %><br>
-                <small> Added on <%= topic.date.strftime('%m/%d/%Y')%> </small>
-                <HR>
-            </div>
+        <% feed.items.each_with_index do |topic,i| %>
+            <div id="feed<%=i%>" class="feed" style="display:none;">
+                <div id="feed-header<%=i%>" 
+                    <%= image_tag "rss_icon.gif", :html => {"align" => "left"}%>
+                    <%= topic.title %><br>
+                    <small> Added on <%= topic.date.strftime('%m/%d/%Y')%> </small>
+                    <HR>
+                </div>
 
-            <div id="feed-description<%=i%>"><%= topic.description.gsub(/<[^>]+>/,"").squeeze(" ").strip %></div>
-        </div>
-    <% end %>
-</div>
+                <div id="feed-description<%=i%>"><%= topic.description.gsub(/<[^>]+>/,"").squeeze(" ").strip %></div>
+            </div>
+        <% end %>
+    </div>
 
-<%= javascript_tag "update_feed(#{feed.items.size})"%>
+    <%= javascript_tag "update_feed(#{feed.items.size})"%>
+<% end %>
 
diff --git a/app/views/griditems/plugins/feed/_formfor_feed.html.erb b/app/views/griditems/plugins/feed/_formfor_feed.html.erb
@@ -2,8 +2,8 @@
     Title : <%= text_field_tag "title" %><br>
     Width : <%= text_field_tag "width", "", :size=>4%><br>
     Height: <%= text_field_tag "height", "", :size=>4%><br>
-    RSS url: <%= text_field_tag "url", "", :size=>24 %><br>
+    RSS url: <%= text_field_tag "uri", "", :size=>24 %><br>
     <%= hidden_field_tag "refresh_rate", "0" %>
-    <%= submit_to_remote "create_grid_item", "Create", :url => {:action => "create_grid_item", :type => type}, :html => {:class => "create"} %> <br>
-    <%= submit_to_remote "update_grid_item", "Update", :url => {:action => "update_grid_item", :type => type}, :html => {:class => "update"} %>
+    <%= submit_to_remote "create_grid_item", "Create", :url => {:action => "create_grid_item", :type => type}, :html => {:class => "create"}, :condition => "validateForm()" %> <br>
+    <%= submit_to_remote "update_grid_item", "Update", :url => {:action => "update_grid_item", :type => type}, :html => {:class => "update"}, :condition => "validateForm()" %>
 <% end %>
diff --git a/app/views/griditems/plugins/gauge/_formfor_gauge.html.erb b/app/views/griditems/plugins/gauge/_formfor_gauge.html.erb
@@ -7,6 +7,6 @@
     <%= observe_field :remote, :function => "jQuery('#gauge_remote_url').toggle()" %>
     Path: <%= text_field_tag "path", "", :size=>24 %><br>
     Refresh: <%= text_field_tag "refresh_rate"%><br>
-    <%= submit_to_remote "create_grid_item", "Create", :url => {:action => "create_grid_item", :type => type}, :html => {:class => "create"} %> <br>
-    <%= submit_to_remote "update_grid_item", "Update", :url => {:action => "update_grid_item", :type => type}, :html => {:class => "update"} %>
+    <%= submit_to_remote "create_grid_item", "Create", :url => {:action => "create_grid_item", :type => type}, :html => {:class => "create"}, :condition => "validateForm()" %> <br>
+    <%= submit_to_remote "update_grid_item", "Update", :url => {:action => "update_grid_item", :type => type}, :html => {:class => "update"} :condition => "validateForm()"%>
 <% end %>
diff --git a/app/views/griditems/plugins/image/_formfor_image.html.erb b/app/views/griditems/plugins/image/_formfor_image.html.erb
@@ -7,6 +7,6 @@
     <%=observe_field :remote, :function => "jQuery('#image_remote_url').toggle()" %>
     Image location: <%= text_field_tag "image", "", :size=>24 %><br>
     Refresh Rate (in seconds): <%= text_field_tag "refresh_rate" %> <br>
-    <%= submit_to_remote "create_grid_item", "Create", :url => {:action => "create_grid_item", :type => type}, :html => {:class => "create"}%> <br>
-    <%= submit_to_remote "update_grid_item", "Update", :url => {:action => "update_grid_item", :type => type}, :html => {:class => "update"} %>
+    <%= submit_to_remote "create_grid_item", "Create", :url => {:action => "create_grid_item", :type => type}, :html => {:class => "create"}, :condition => "validateForm()"%> <br>
+    <%= submit_to_remote "update_grid_item", "Update", :url => {:action => "update_grid_item", :type => type}, :html => {:class => "update"}, :condition => "validateForm()" %>
 <% end %>
diff --git a/app/views/griditems/plugins/nagios/_formfor_nagios.html.erb b/app/views/griditems/plugins/nagios/_formfor_nagios.html.erb
@@ -6,6 +6,6 @@
     Nagios User Name : <%= text_field_tag "username"%> <br>
     Nagios Password : <%= text_field_tag "password"%> <br>
     Refresh (in seconds): <%= text_field_tag "refresh_rate", "", :size=>10, :id => "height" %> <br>
-    <%= submit_to_remote "create_grid_item", "Update", :url => {:action => "create_grid_item", :type => type}, :html => {:class => "create"} %> <br>
-    <%= submit_to_remote "update_grid_item", "Update", :url => {:action => "update_grid_item", :type => type}, :html => {:class => "update"} %>
+    <%= submit_to_remote "create_grid_item", "Update", :url => {:action => "create_grid_item", :type => type}, :html => {:class => "create"}, :condition => "validateForm()" %> <br>
+    <%= submit_to_remote "update_grid_item", "Update", :url => {:action => "update_grid_item", :type => type}, :html => {:class => "update"}, :condition => "validateForm()" %>
 <% end %>
diff --git a/app/views/griditems/plugins/twitter/_formfor_twitter.html.erb b/app/views/griditems/plugins/twitter/_formfor_twitter.html.erb
@@ -2,8 +2,8 @@
     Following? : <%= text_field_tag "title" %><br>
     Width : <%= text_field_tag "width", "", :size=>4%><br>
     Height: <%= text_field_tag "height", "", :size=>4%><br>
-    Feed uri: <%= text_field_tag "url", "", :size=>24 %><br>
+    Feed uri: <%= text_field_tag "uri", "", :size=>24 %><br>
     <%= hidden_field_tag "refresh_rate", "0"%>
-    <%= submit_to_remote "create_grid_item", "Create", :url => {:action => "create_grid_item", :type => type}, :html => {:class => "create"} %> <br>
-    <%= submit_to_remote "update_grid_item", "Update", :url => {:action => "update_grid_item", :type => type}, :html => {:class => "update"} %>
+    <%= submit_to_remote "create_grid_item", "Create", :url => {:action => "create_grid_item", :type => type}, :html => {:class => "create"}, :condition => "validateForm()" %> <br>
+    <%= submit_to_remote "update_grid_item", "Update", :url => {:action => "update_grid_item", :type => type}, :html => {:class => "update"}, :condition => "validateForm()" %>
 <% end %>
diff --git a/app/views/griditems/plugins/twitter/_twitter.html.erb b/app/views/griditems/plugins/twitter/_twitter.html.erb
@@ -1,5 +1,5 @@
 <!-- Since the twitter plugin is so closely related to the feed plugin, we're using the feed helper get_feed in both plugins, even tho it is only listed in feed.rb-->
-<% feed = get_feed(@parameters["url"])%>
+<% feed = get_feed(@parameters["uri"])%>
 
 <div class="ui-widget">
     <div class="ui-widget-header">

diff --git a/app/views/griditems/save_state.html.erb b/app/views/griditems/save_state.html.erb
diff --git a/app/views/griditems/show.html.erb b/app/views/griditems/show.html.erb
diff --git a/lib/generators/board_plugin/board_plugin_generator.rb b/lib/generators/board_plugin/board_plugin_generator.rb
@@ -31,4 +31,9 @@ def manifest
 
         end
     end
+
+    protected 
+        def banner
+            "Usage: #{$0} board_plugin plugin_name"
+        end
 end
diff --git a/lib/generators/board_plugin/templates/lib/views/_formfor_plugin.html.erb b/lib/generators/board_plugin/templates/lib/views/_formfor_plugin.html.erb
@@ -1,4 +1,4 @@
-<% form_remote_tag :html => { :action => url_for(:controller => "griditems", :action =>"create_grid_item"), :id => "form_for"} do %>
+<% form_remote_tag :html => { :action => url_for(:controller => "griditems", :action =>"create_grid_item"), :id => "form_for"} do %>"
     <! -- Required form elements -->
     Title : <%= text_field_tag "title" %> <br> 
     Width : <%= text_field_tag "width", "", :size=>4%><br>
@@ -7,6 +7,6 @@
     <!-- Your form content goes here -->
 
     <! -- Required submit buttons -->
-    <%= submit_to_remote "create_grid_item", "Create", :url => {:action => "create_grid_item", :type => type}, :html => {:class => "create"} %> <br>
-    <%= submit_to_remote "update_grid_item", "Update", :url => {:action => "update_grid_item", :type => type}, :html => {:class => "update"} %>
+    <%= submit_to_remote "create_grid_item", "Create", :url => {:action => "create_grid_item", :type => type}, :html => {:class => "create"}, :condition => "" %> <br>
+    <%= submit_to_remote "update_grid_item", "Update", :url => {:action => "update_grid_item", :type => type}, :html => {:class => "update"}, :condition => ""%>
 <% end %>
diff --git a/public/gauge.tgz b/public/gauge.tgz
diff --git a/public/javascripts/bernard.js b/public/javascripts/bernard.js
@@ -30,39 +30,40 @@ jQuery(document).ready(function() {
 		}
 	);
 	jQuery('#type').change(); //Need the onchange event on page load to load a form for the initial selected plugin type
-		jQuery("#deleteitem").click(function(e){
-			jQuery(lastTarget).remove();	
-			jQuery("#vmenu").toggle();
-
-		});
 
-		jQuery("#edititem").click(function(e){
-			centerPopup('popup');
-			loadPopup('popup');
-			form = document.getElementById('select_form');
-			type = jQuery(lastTarget).data('data').type
-			for(var i=0; i < form.type.length; i++){
-				if(form.type[i].value == type.capitalize()){
-					form.type[i].selected = true;
-				}
-			}
-			type = document.getElementById(form.type.id)
-			jQuery(type).change();
-			alert("Loading item ->" + jQuery(lastTarget).data('data').title);
-			jQuery('.create').hide();
-			jQuery('.update').show();
-			jQuery('#form_for input[name=title]').val(jQuery(lastTarget).data('data').title);
-			jQuery('#form_for input[name=height]').val(jQuery(lastTarget).height());
-			jQuery('#form_for input[name=width]').val(jQuery(lastTarget).width());
-			jQuery('#form_for input[name=refresh_rate]').val(jQuery(lastTarget).data('data').refresh_rate);
-			var paramArray = jQuery(lastTarget).data('data').params.split(";");
-
-			for(var i = 0; i < paramArray.length; i++) {
-				var ithParam = paramArray[i].split(":");
-				jQuery('#form_for input[name=' + ithParam[0] + ']').val(ithParam[1]);
+	jQuery("#deleteitem").click(function(e){
+		jQuery(lastTarget).remove();	
+		jQuery("#vmenu").toggle();
+		jQuery('#results-content').empty();
+	});
+
+	jQuery("#edititem").click(function(e){
+		centerPopup('popup');
+		loadPopup('popup');
+		form = document.getElementById('select_form');
+		type = jQuery(lastTarget).data('data').type
+		for(var i=0; i < form.type.length; i++){
+			if(form.type[i].value == type.capitalize()){
+				form.type[i].selected = true;
 			}
-
-		}); 
+		}
+		type = document.getElementById(form.type.id)
+		jQuery(type).change();
+		alert("Loading item ->" + jQuery(lastTarget).data('data').title);
+		jQuery('.create').hide();
+		jQuery('.update').show();
+		jQuery('#form_for input[name=title]').val(jQuery(lastTarget).data('data').title);
+		jQuery('#form_for input[name=height]').val(jQuery(lastTarget).height());
+		jQuery('#form_for input[name=width]').val(jQuery(lastTarget).width());
+		jQuery('#form_for input[name=refresh_rate]').val(jQuery(lastTarget).data('data').refresh_rate);
+		var paramArray = jQuery(lastTarget).data('data').params.split(";");
+
+		for(var i = 0; i < paramArray.length; i++) {
+			var ithParam = paramArray[i].split(":");
+			jQuery('#form_for input[name=' + ithParam[0] + ']').val(ithParam[1]);
+		}
+
+	}); 
 
 	jQuery(document).click(function() {
 		jQuery("#vmenu").hide();
@@ -119,8 +120,7 @@ function enableEvents(e) {
 	item = document.getElementById(e)
 	display = document.getElementById('results-content')
 
-	display.innerHTML = 'Object name : ' + e + '<br>'
-	+ 'x-axis : ' + jQuery(item).offset().left + '<br>'
+	display.innerHTML = 'x-axis : ' + jQuery(item).offset().left + '<br>'
 	+ 'y-axis : ' + jQuery(item).offset().top + '<br>'
 	+ 'Height : ' + (Element.getHeight(item)  - 4) + '<br>' 
 	+ 'Width : ' + (Element.getWidth(item) - 4) + '<br>'
@@ -219,3 +219,26 @@ function positionItem(item, x, y){
 	i = document.getElementById(item)
 	jQuery(i).offset({top : y, left : x })
 }
+
+//Validate general form fields. 
+//Annonymous function is behaving strangely. Return is not terminating function. Look at that.
+function validateForm(){
+	var returnValue = true;
+	jQuery(':input', '#form_for').each(function(){
+		if(this.value == ""){ 
+			alert("Please complete all fields.");
+			returnValue = false;
+			return false; 
+		}
+	});
+
+	if(isNaN(jQuery('#form_for input[name=width]').val())){
+		alert("Width must be a integer value.");
+		returnValue = false;
+	}
+	if(isNaN(jQuery('#form_for input[name=height]').val())){ 
+		alert("Height must be a integer value.");
+		returnValue = false; 
+	}
+	return returnValue;
+}