spud_cms 1.0.0.rc1.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5bee98ed2c9ce3ffb76ced5ec6584d88defee2b
-  data.tar.gz: be4c66388397b43c197dd2225037611cecc2e5aa
+  metadata.gz: bd2bbb5aefb650f147917cd4c3b56b41519b297d
+  data.tar.gz: 158318a0fd5f64b169db6f8d9412a0ff421c241a
 SHA512:
-  metadata.gz: 4ab0d94e2cff6c17c2abf3a34e0e58b1c7f8b0287e0754ebc9897cb6abd34232b31988fb63feb381bd309d94381d0f5a1fcc2632d52fa9396404ffce09bf9f8a
-  data.tar.gz: 4e591822fc163ae5c2325d5d0bd76f6e1a7ed9f7fa2a0cc9d85bfaa3d5255473e74e9c0ea468f7830ae7405b9a9012cbf531e54fc70e99eaeab590de8d4cc786
+  metadata.gz: 9f99e55c1f0cce3f30c1a84033e832162567932f4da53cc376be74da8f67245504bc5945058036c8efa4737693983bb290ea5d87196b0914c1c79b3ce9f7641b
+  data.tar.gz: 466149d8eb091606e94caf8a94d69e51c1077e22c6784fac5908587f4e0b75cfd8408cb079034f6364f741ecad32cd40d226afe5782995813191b65816265823

data/app/assets/javascripts/spud/admin/cms/menu_items.js

@@ -3,8 +3,14 @@ spud.admin.cms.menu_items = {};
 (function() {
   var menu_items = spud.admin.cms.menu_items;
   var menuId = 0;
-  menu_items.init = function(id) {
+  var menuUrl = "/spud/admin/menus/"
+  menu_items.init = function(id, url) {
     menuId = id;
+    if(url) {
+      menuUrl = url
+    } else {
+      menuUrl = menuUrl + menuId + "/menu_items/sort"
+    }
     $('.sortable').sortable({
       connectWith:".connectedSortable",
       start: function(event,ui) {
@@ -41,7 +47,7 @@ spud.admin.cms.menu_items = {};
 
     // Post To Menu Items Save method
     $.ajax({
-      url: "/spud/admin/menus/" + menuId + "/menu_items/sort",
+      url: menuUrl,
       type: 'post',
       data: {menu_order: JSON.stringify(orderArray), _method: 'put'}
     });

data/app/assets/javascripts/spud/admin/cms/pages.js

@@ -25,13 +25,6 @@ spud.admin.cms.pages = {};
       tabButtons.append(tabButton);
 
     }
-    pages.tabMonitor();
-  };
-  pages.tabMonitor = function() {
-    $('a.spud-page-tab-button[data-toggle="tab"]').on('shown', function (e) {
-      var editors = $(e.target).find('.spud-formatted-editor');
-      spud.admin.editor.unload();//'.formtab [code-mirror-id]'
-      spud.admin.editor.init(editors);
-    })
   };
+  
 })();

data/app/views/spud/admin/menu_items/_form.html.erb

@@ -1,39 +1,39 @@
 <%=error_messages_for(f.object)%>
 <fieldset>
-<div class="control-group">
-	<%=f.label :name, :required=>true,:class => "control-label"%>
-	<div class="controls">
-		<%=f.text_field :name,:title => "",:size=>40%>
+<div class="form-group">
+	<%=f.label :name, :required=>true,:class => "control-label col-sm-2"%>
+	<div class="col-sm-8">
+		<%=f.text_field :name,:title => "",:class => "form-control"%>
 	</div>
 
 </div>
 
-<div class="control-group">
-	<%=f.label :spud_page_id, "Page",:class => "control-label"%>
-	<div class="controls">
-	    <%=f.select :spud_page_id,options_for_select(SpudPage.options_tree_for_page(:site_id => session[:admin_site]),@menu_item.spud_page_id),{:include_blank => 'Use URL instead'},{:title => "",:onchange => "if($(this).val() != '') {$('#spud_menu_item_url').val('');}"}%>
+<div class="form-group">
+	<%=f.label :spud_page_id, "Page",:class => "control-label col-sm-2"%>
+	<div class="col-sm-8">
+	    <%=f.select :spud_page_id,options_for_select(SpudPage.options_tree_for_page(:site_id => session[:admin_site]),@menu_item.spud_page_id),{:include_blank => 'Use URL instead'},{:title => "", :class => "form-control",:onchange => "if($(this).val() != '') {$('#spud_menu_item_url').val('');}"}%>
 	</div>
 
 </div>
 
 
 
-<div class="control-group">
-	<%=f.label :url,:class => "control-label"%>
-	<div class="controls">
-		<%=f.text_field :url,:title => "",:size=>40%>
+<div class="form-group">
+	<%=f.label :url,:class => "control-label col-sm-2"%>
+	<div class="col-sm-8">
+		<%=f.text_field :url,:title => "",:class => "form-control"%>
 	</div>
 </div>
-<div class="control-group">
-	<%=f.label :classes,:class => "control-label"%>
-	<div class="controls">
-		<%=f.text_field :classes,:title => "",:size=>40%>
+<div class="form-group">
+	<%=f.label :classes,:class => "control-label col-sm-2"%>
+	<div class="col-sm-8">
+		<%=f.text_field :classes,:title => "",:class => "form-control"%>
 	</div>
 </div>
-<div class="control-group">
-	<%=f.label :parent, "Parent Menu",:class => "control-label"%>
-	<div class="controls">
-		<%=f.select :parent_id,options_for_select(SpudMenuItem.options_tree_for_item(@menu,:filter => @menu_item),@menu_item.parent_type == 'SpudMenuItem' ? @menu_item.parent_id : nil),{:include_blank => "#{@menu.name}"},{:title => ""}%>
+<div class="form-group">
+	<%=f.label :parent, "Parent Menu",:class => "control-label col-sm-2"%>
+	<div class="col-sm-8">
+		<%=f.select :parent_id,options_for_select(SpudMenuItem.options_tree_for_item(@menu,:filter => @menu_item),@menu_item.parent_type == 'SpudMenuItem' ? @menu_item.parent_id : nil),{:include_blank => "#{@menu.name}"},{:title => "", :class => "form-control"}%>
 	</div>
 
 </div>

data/app/views/spud/admin/menu_items/_menu_item_row.html.erb

@@ -2,7 +2,13 @@
 
 	<span class="row_meta"><%=prefix if defined? prefix%><%=link_to menu_item.name,edit_spud_admin_menu_menu_item_path(:id => menu_item.id)%></span>
 
-	<span class="edit_controls"><%=link_to "Edit",edit_spud_admin_menu_menu_item_path(:id => menu_item.id), :title => "Edit Menu Item",:class => 'btn btn-small'%>&nbsp;&nbsp;<%=link_to "Remove",spud_admin_menu_menu_item_path(:id => menu_item.id),:method => :delete,:class => 'btn btn-small btn-danger', :data => {:confirm => "Are you sure you want to remove this menu item?"}%></span>
+	<span class="edit_controls">
+		<%=link_to "Edit",edit_spud_admin_menu_menu_item_path(:id => menu_item.id), :title => "Edit Menu Item",:class => 'btn btn-sm btn-link'%>
+		&nbsp;&nbsp;
+		<%=link_to spud_admin_menu_menu_item_path(:id => menu_item.id),:method => :delete,:class => 'btn btn-sm btn-danger', :data => {:confirm => "Are you sure you want to remove this menu item?"} do%>
+			<span class="glyphicon glyphicon-trash"></span>
+		<%end%>
+	</span>
 	<br style="clear:both;"/>
 </div>
 <ul class="menu_list subitem sortable connectedSortable">

data/app/views/spud/admin/menu_items/edit.html.erb

@@ -3,8 +3,10 @@
 
   <%=form_for @menu_item,:url => spud_admin_menu_menu_item_path(:id => @menu_item.id),:html=>{:class=>"form-horizontal"} do |f|%>
     <%=render :partial => "form",:locals => {:f => f}%>
-    <div class="form-actions">
-    	<%=f.submit "Save Menu Item", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_menu_menu_items_path,:class => "btn"%>
+    <div class="form-group">
+		<div class="col-sm-8 col-sm-offset-2">
+    	<%=f.submit "Save Menu Item", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_menu_menu_items_path,:class => "btn btn-default"%>
+    	</div>
     </div>
   <%end%>
 

data/app/views/spud/admin/menu_items/new.html.erb

@@ -3,8 +3,10 @@
 
   <%=form_for @menu_item,:url => spud_admin_menu_menu_items_path,:html=>{:class=>"form-horizontal"} do |f|%>
     <%=render :partial => "form",:locals => {:f => f}%>
-    <div class="form-actions">
-    	<%=f.submit "Create Menu Item", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_menu_menu_items_path,:class => "btn"%>
+    <div class="form-group">
+		<div class="col-sm-8 col-sm-offset-2">
+	    	<%=f.submit "Create Menu Item", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_menu_menu_items_path,:class => "btn btn-default"%>
+    	</div>
     </div>
   <%end%>
 

data/app/views/spud/admin/menus/_form.html.erb

@@ -1,11 +1,10 @@
 <%=error_messages_for(f.object)%>
 <fieldset>
-<div class="control-group">
-	<%=f.label :name, :required=>true,:class => "control-label"%>
-	<div class="controls">
-	  <%=f.text_field :name,:title => "",:size=>40%>
+<div class="form-group">
+	<%=f.label :name, :required=>true,:class => "control-label col-sm-2"%>
+	<div class="col-sm-8">
+		<%=f.text_field :name,:title => "",:size=>40, :class => "form-control"%>
 	</div>
-
 </div>
 </fieldset>
 

data/app/views/spud/admin/menus/edit.html.erb

@@ -3,8 +3,10 @@
 
   <%=form_for @menu,:url => spud_admin_menu_path(:id => @menu.id),:html=>{:class=>"form-horizontal"} do |f|%>
     <%=render :partial => "form",:locals => {:f => f}%>
-    <div class="form-actions">
-    	<%=f.submit "Save Menu", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_menus_path,:class => "btn"%>
+    <div class="form-group">
+		<div class="col-sm-8 col-sm-offset-2">
+	    	<%=f.submit "Save Menu", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_menus_path,:class => "btn btn-default"%>
+    	</div>
     </div>
 
   <%end%>

data/app/views/spud/admin/menus/index.html.erb

@@ -9,8 +9,10 @@
 					<span class="row_meta"><%=link_to menu.name,spud_admin_menu_menu_items_path(:menu_id => menu.id)%></span>
 
 					<span class="edit_controls">
-						<%=link_to "Edit",edit_spud_admin_menu_path(:id => menu.id),:class => 'btn'%>
-						<%=link_to "Remove",spud_admin_menu_path(:id => menu.id),:method => :delete,:class => 'btn btn-danger',:confirm => "Are you sure you want to remove this menu and all items associated with it?"%>
+						<%=link_to "Edit",edit_spud_admin_menu_path(:id => menu.id),:class => 'btn btn-link btn-sm'%>
+						<%=link_to spud_admin_menu_path(:id => menu.id),:method => :delete,:class => 'btn btn-sm btn-danger',:confirm => "Are you sure you want to remove this menu and all items associated with it?" do%>
+							<span class="glyphicon glyphicon-trash"></span>
+						<%end%>
 					</span>
 					<br style="clear:both;"/>
 				</div>

data/app/views/spud/admin/menus/new.html.erb

@@ -1,7 +1,9 @@
 <%=form_for @menu,:url => spud_admin_menus_path,:html=>{:class=>"form-horizontal"} do |f|%>
   <%=render :partial => "form",:locals => {:f => f}%>
-  <div class="form-actions">
-    <%=f.submit "Create Menu", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_menus_path,:class => "btn"%>
+  <div class="form-group">
+		<div class="col-sm-8 col-sm-offset-2">
+		    <%=f.submit "Create Menu", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_menus_path,:class => "btn btn-default"%>
+	    </div>
   </div>
 
 <%end%>

data/app/views/spud/admin/pages/_form.html.erb

@@ -1,60 +1,62 @@
 <%=error_messages_for(f.object)%>
 <fieldset>
-  <div class="control-group">
   <legend>Page Title</legend>
-    	<%=f.label :name, :required=>true,:style =>"display:none;", :class=>"control-label"%>
-
-        <%=f.text_field :name, :class => "full-width"%>
-
+  <div class="form-group">
+  
+    <%=f.label :name, :required=>true,:style =>"display:none;", :class=>"control-label"%>
+    <div class="col-sm-12">
+      <%=f.text_field :name, :class => "form-control full-width"%>
+    </div>
   </div>
 </fieldset>
 <div id="page_partials_form" class="formtabs tab-content">
-	<ul class="formtab_buttons nav nav-tabs">
-	</ul>
-	<%=f.fields_for :spud_page_partials do |b|%>
-		<div class="formtab tab-pane">
-			<%=b.hidden_field :name,:class => "tab_name"%>
-      <div class="control-group">
-        <div class="controls">
+  <ul class="formtab_buttons nav nav-tabs">
+  </ul>
+  <%=f.fields_for :spud_page_partials do |b|%>
+    <div class="formtab tab-pane">
+      <%=b.hidden_field :name,:class => "tab_name"%>
+      <div class="form-group">
+        <div class="col-sm-12">
           <%=b.select :format,Spud::Core.renderers.collect { |k,v| [v[:description] || k, k]}, {:include_blank => false}, :class => "pull-right", "data-formatter" => "spud_partial_#{b.object.name.parameterize}"%>
         </div>
       </div>
       <div style="clear:both;">
-  			<%=b.text_area :content,:class => "spud-formatted-editor", :rows => 10, :id => "spud_partial_#{b.object.name.parameterize}","data-format" => b.object.format%>
+        <%=b.text_area :content,:class => "spud-formatted-editor", :rows => 10, :id => "spud_partial_#{b.object.name.parameterize}","data-format" => b.object.format%>
       </div>
-		</div>
-	<%end%>
+    </div>
+  <%end%>
 </div>
 <br />
 <fieldset>
   <legend>Advanced Settings (optional)</legend>
 
-    	<div class="control-group">
+      <div class="form-group">
 
-      	<%=f.label :layout, "Template", :class=>"control-label"%>
-        <div class="controls">
-        	<%=f.select :layout, options_for_select(layout_options,@page.layout),{},{:title => "", 'data-source' => page_parts_spud_admin_pages_path(:page => @page.id) }%>
+        <%=f.label :layout, "Template", :class=>"control-label col-sm-2"%>
+        <div class="col-sm-8">
+          <%=f.select :layout, options_for_select(layout_options,@page.layout),{},{:title => "", :class => "form-control", 'data-source' => page_parts_spud_admin_pages_path(:page => @page.id) }%>
           <span class="help-inline">Use this to control the layout template to be used for this page if they are available.</span>
         </div>
-  	  </div>
-
-    <div class="control-group">
-
-      <%=f.label :spud_page_id, "Parent Page", :class=>"control-label"%>
-      <div class="controls">
-        <%=f.select :spud_page_id,options_for_select(SpudPage.options_tree_for_page(:filter => @page,:site_id => session[:admin_site]),@page.spud_page_id),{:include_blank => 'None'},{:title => ""}%>
+      </div>
 
+    <div class="form-group">
+      <%=f.label :spud_page_id, "Parent Page", :class=>"control-label col-sm-2"%>
+      <div class="col-sm-8">
+        <%=f.select :spud_page_id,options_for_select(SpudPage.options_tree_for_page(:filter => @page,:site_id => session[:admin_site]),@page.spud_page_id),{:include_blank => 'None'},{:title => "", :class => "form-control"}%>
       </div>
     </div>
-    <div class="control-group">
+    <div class="form-group">
 
-      <%=f.label :url_name, "Perma Link",:disabled => true, :class=>"control-label"%>
-      <div class="controls">
-        <%=root_url%><%=f.text_field :url_name,:title => "",:size=>20%>
-        <label class="checkbox inline">
-        <%=f.check_box :use_custom_url_name,:onchange => "$('#spud_page_url_name').attr('disabled',!this.checked);"%>
-        Customize this pages url
-        </label>
+      <%=f.label :url_name, "Perma Link",:disabled => true, :class=>"control-label col-sm-2"%>
+      <div class="col-sm-8">
+        <%=root_url%><%=f.text_field :url_name,:title => "",:size=>20, :class => "form-control", :disabled => (f.object.use_custom_url_name ? nil : true)%>
+        <div class="checkbox">
+          <label>
+            <%=f.check_box :use_custom_url_name,:onchange => "$('#spud_page_url_name').attr('disabled',!this.checked);"%>
+            Customize this pages url    
+          </label>
+        
+        </div>
       </div>
     </div>
 
@@ -63,36 +65,36 @@
   <legend>Meta Information (optional)</legend>
   <p>These fields are used to notify search engines about important keywords and the appropriate description to display in a search result.</p>
 
-    <div class="control-group">
-      <%=f.label :meta_keywords,"Keywords", :class=>"control-label"%>
-      <div class="controls">
-        <%=f.text_field :meta_keywords,:title => "",:style=>"width:600px;" %>
+    <div class="form-group">
+      <%=f.label :meta_keywords,"Keywords", :class=>"control-label col-sm-2"%>
+      <div class="col-sm-8">
+        <%=f.text_field :meta_keywords,:title => "", :class => "form-control"%>
         <span class="help-inline">A Comma seperated list of keywords for search engines. Keep it short (no more than 10 keywords)</span>
       </div>
 
     </div>
-    <div class="control-group">
-      <%=f.label :meta_description,"Description", :class=>"control-label"%>
-      <div class="controls">
-        <%=f.text_area :meta_description,:style =>"width:600px;height:40px;"%>
+    <div class="form-group">
+      <%=f.label :meta_description,"Description", :class => "control-label col-sm-2"%>
+      <div class="col-sm-8">
+        <%=f.text_area :meta_description,:style => "height:60px;", :class => "form-control"%>
         <span class="help-inline">A short description of the page. This is what appears on a search engines search result page.</span>
       </div>
     </div>
-    <div class="control-group">
-      <%=f.label :visibility, :class=>"control-label"%>
-      <div class="controls">
-    		<%=f.select :visibility, [["Public",0],["Private",1]]%>
+    <div class="form-group">
+      <%=f.label :visibility, :class=>"control-label col-sm-2"%>
+      <div class="col-sm-8">
+        <%=f.select :visibility, [["Public",0],["Private",1]], :class => "form-control"%>
       </div>
-  	</div>
-  	<div class="control-group">
-      <%=f.label :published, :class=>"control-label"%>
-      <div class="controls">
-    		<%=f.check_box :published%>
+    </div>
+    <div class="form-group">
+      <%=f.label :published, :class=>"control-label col-sm-2"%>
+      <div class="col-sm-8">
+        <%=f.check_box :published%>
       </div>
-  	</div>
-    <div class="control-group">
-      <%=f.label :notes,"Notes", :class=>"control-label"%>
-      <div class="controls">
+    </div>
+    <div class="form-group">
+      <%=f.label :notes,"Notes", :class=>"control-label col-sm-2"%>
+      <div class="col-sm-8">
         <%=f.text_area :notes,:style =>"width:400px;height:40px;"%>
         <span class="help-inline">Have a note to make about this page while you work? Place it here for later.</span>
       </div>

data/app/views/spud/admin/pages/_page_row.html.erb

@@ -2,7 +2,13 @@
 					
 	<span class="row_meta"><%=prefix if defined? prefix%><%=link_to page.name,edit_spud_admin_page_path(:id => page.id)%></span>
 
-	<span class="edit_controls"><%=link_to "Preview",spud_admin_page_path(:id => page.id), :title => "Preview",:class => 'btn'%>&nbsp;&nbsp;<%=link_to "Remove",spud_admin_page_path(:id => page.id),:method => :delete,:class => 'btn btn-danger',:confirm => "Are you sure you want to remove this page?"%></span>
+	<span class="edit_controls">
+		<%=link_to "Preview",spud_admin_page_path(:id => page.id), :title => "Preview",:class => 'btn btn-sm btn-link'%>
+		&nbsp;&nbsp;
+		<%=link_to spud_admin_page_path(:id => page.id),:method => :delete,:class => 'btn btn-sm btn-danger',:confirm => "Are you sure you want to remove this page?" do%>
+			<span class="glyphicon glyphicon-trash"></span>
+		<%end%>
+	</span>
 	<br style="clear:both;"/>
 </div>
 <%if !page.spud_pages.all.blank?%>

data/app/views/spud/admin/pages/edit.html.erb

@@ -1,7 +1,9 @@
 <%=form_for @page,:url => spud_admin_page_path(:id => @page.id),:html=>{:class=>"form-horizontal page_form" } do |f|%>
 	<%=render :partial => "form",:locals => {:f => f}%>
-    <div class="form-actions">
-    	<%=f.submit "Save Page", :class=>"btn btn-primary btn-save"%>&nbsp;<%=f.submit "Preview", :class=>"btn btn-info btn-preview"%> or <%=link_to "cancel",spud_admin_pages_path,:class => "btn"%>
+    <div class="form-group">
+		<div class="col-sm-8 col-sm-offset-2">
+	    	<%=f.submit "Save Page", :class=>"btn btn-primary btn-save"%>&nbsp;<%=f.submit "Preview", :class=>"btn btn-info btn-preview"%> or <%=link_to "cancel",spud_admin_pages_path,:class => "btn btn-default"%>
+	    </div>
     </div>
 <%end%>
 <br />

data/app/views/spud/admin/pages/new.html.erb

@@ -1,7 +1,10 @@
 <%=form_for @page,:url => spud_admin_pages_path(),:html=>{:class=>"form-horizontal page_form"} do |f|%>
 	<%=render :partial => "form",:locals => {:f => f}%>
-	<div class="form-actions">
-    	<%=f.submit "Create Page", :class=>"btn btn-primary form-btn btn-save","data-loading-text"=>"Saving..."%>&nbsp;<%=f.submit "Preview", :class=>"btn btn-primary btn-preview"%> or <%=link_to "cancel",spud_admin_pages_path,:class => "btn"%>
+	<div class="form-group">
+		<div class="col-sm-8 col-sm-offset-2">
+	    	<%=f.submit "Create Page", :class=>"btn btn-primary form-btn btn-save","data-loading-text"=>"Saving..."%>
+	    	&nbsp;
+	    	<%=f.submit "Preview", :class=>"btn btn-primary btn-preview"%> or <%=link_to "cancel",spud_admin_pages_path,:class => "btn btn-link"%>
     </div>
 
 <%end%>

data/app/views/spud/admin/snippets/_form.html.erb

@@ -1,11 +1,17 @@
 <fieldset>
-  <%= f.label :name, :required=>true,:style =>"display:none;" %>
-  <%= f.text_field :name, :class => "full-width",:placeholder=>"Enter title here" %>
+<div class="form-group">
+	<%= f.label :name, :required=>true,:style =>"display:none;", :class => "control-label" %>
+	<div class="col-sm-12 ">
+		<%= f.text_field :name, :class => "full-width form-control",:placeholder=>"Enter title here" %>
+	</div>
+</div>
+  
+  
 </fieldset>
 <br/>
 <div>
-  <div class="control-group">
-	  <div class="controls">
+  <div class="form-group">
+	  <div class="col-sm-12">
 	    <%=f.select :format,Spud::Core.renderers.collect { |k,v| [v[:description] || k, k]}, {:include_blank => false}, :class => "pull-right", "data-formatter" => "spud_snippet_content_area"%>
 	  </div>
 	</div>

data/app/views/spud/admin/snippets/edit.html.erb

@@ -1,7 +1,9 @@
 <%=form_for @snippet,:url => spud_admin_snippet_path(@snippet),:html=>{:class=>"form-horizontal"} do |f|%>
   <%=render :partial => "form",:locals => {:f => f}%>
-  <div class="form-actions">
-    <%=f.submit "Save Snippet", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_snippets_path,:class => "btn"%>
+  <div class="form-group">
+		<div class="col-sm-8 col-sm-offset-2">
+		    <%=f.submit "Save Snippet", :class=>"btn btn-primary"%> or <%=link_to "cancel",spud_admin_snippets_path,:class => "btn btn-default"%>
+	    </div>
   </div>
 
 <%end%>