Merge commit '3865622b9c9bdcab1fe858745273c5d4f0c0d996' into HEAD

lib/app.rb

@@ -16,129 +16,121 @@ class App < Sinatra::Base
 
   # Content routing
   get '/new' do
-    on_get("New Need", "content/new_need_message", "content/new", "content/contentlayout")
+    on_get("New Need", "content/new_need_message", "content/new")
   end
 
   post '/new' do
     @header = "New Need"
     @header_message = :"content/new_need_message"
     @template = "content/new"
-    @layout = "content/contentlayout"
 
     @errors = Guard.validationsForNewNeed(params)
     on_post(params, "new")
   end
 
   get '/amend-content' do
-    on_get("Content Change", "content/content_amend_message", "content/amend", "content/contentlayout")
+    on_get("Content Change", "content/content_amend_message", "content/amend")
   end
 
   post '/amend-content' do
     @header = "Content Change"
     @header_message = :"content/content_amend_message"
     @template = "content/amend"
-    @layout = "content/contentlayout"
 
     @errors = Guard.validationsForAmendContent(params)
     on_post(params, "amend-content")
   end
 
 #  User access routing
   get '/create-user' do
-    on_get("Create New User", "useraccess/user_create_message", "useraccess/user", "useraccess/userlayout")
+    on_get("Create New User", "useraccess/user_create_message", "useraccess/user")
   end
 
   post '/create-user' do
     @header = "Create New User"
     @header_message = :"useraccess/user_create_message"
     @template = "useraccess/user"
-    @layout = "useraccess/userlayout"
 
     @errors = Guard.validationsForUserAccess(params)
     on_post(params, "create-user")
   end
 
   get '/remove-user' do
-    on_get("Remove User", "useraccess/user_remove_message", "useraccess/userremove", "useraccess/userlayout")
+    on_get("Remove User", "useraccess/user_remove_message", "useraccess/userremove")
   end
 
   post '/remove-user' do
     @header = "Remove User"
     @header_message = :"useraccess/user_remove_message"
     @template = "useraccess/userremove"
-    @layout = "useraccess/userlayout"
 
     @errors = Guard.validationsForDeleteUser(params)
     on_post(params, "remove-user")
   end
 
   get '/reset-password' do
-    on_get("Reset Password", "useraccess/user_password_reset_message", "useraccess/resetpassword", "useraccess/userlayout")
+    on_get("Reset Password", "useraccess/user_password_reset_message", "useraccess/resetpassword")
   end
 
   post '/reset-password' do
     @header = "Reset Password"
     @header_message = :"useraccess/user_password_reset_message"
     @template = "useraccess/resetpassword"
-    @layout = "useraccess/userlayout"
 
     @errors = Guard.validationsForUserAccess(params)
     on_post(params, "reset-password")
   end
 
 #  Campaigns routing
   get '/campaign' do
-    on_get("Campaign", "campaigns/campaign_message", "campaigns/campaign", "campaigns/campaignslayout")
+    on_get("Campaign", "campaigns/campaign_message", "campaigns/campaign")
   end
 
   post '/campaign' do
     @header = "Reset Password"
     @header_message = :"campaigns/campaign_message"
     @template = "campaigns/campaign"
-    @layout = "campaigns/campaignslayout"
 
     @errors = Guard.validationsForCampaign(params)
     on_post(params, "campaign")
   end
 
   #Tech Issue routing
   get '/broken-link' do
-    on_get("Broken Link", "tech-issues/message_broken_link", "tech-issues/broken_link", "tech-issues/tech_issue_layout")
+    on_get("Broken Link", "tech-issues/message_broken_link", "tech-issues/broken_link")
   end
 
   post '/broken-link' do
     params[:user_agent] = @request.user_agent
     @header = "Broken Link"
     @header_message = :"tech-issues/message_broken_link"
     @template = "tech-issues/broken_link"
-    @layout = "tech-issues/tech_issue_layout"
 
     @errors = Guard.validationsForBrokenLink(params)
     on_post(params, "broken-link")
   end
 
   get '/publish-tool' do
-    on_get("Publishing Tool", "tech-issues/message_publish_tool", "tech-issues/publish_tool", "tech-issues/tech_issue_layout")
+    on_get("Publishing Tool", "tech-issues/message_publish_tool", "tech-issues/publish_tool")
   end
 
   post '/publish-tool' do
     params[:user_agent] = @request.user_agent
     @header = "Publishing Tool"
     @header_message = :"tech-issues/message_publish_tool"
     @template = "tech-issues/publish_tool"
-    @layout = "tech-issues/tech_issue_layout"
 
     @errors = Guard.validationsForPublishTool(params)
     on_post(params, "publish-tool")
   end
 
-  def on_get(head, head_message_form, template, layout)
+  def on_get(head, head_message_form, template)
     @departments = ZendeskClient.get_departments
     @header = head
     @header_message = :"#{head_message_form}"
     @formdata = {}
 
-    erb :"#{template}", :layout => :"#{layout}"
+    erb :"#{template}", :layout => :formlayout
   end
 
   def on_post(params, route)
@@ -151,10 +143,10 @@ def on_post(params, route)
         redirect '/acknowledge'
       else
         @errors = Guard.fail_to_create_ticket
-        erb :"#{@template}", :layout => :"#{@layout}"
+        erb :"#{@template}", :layout => :formlayout
       end
     else
-      erb :"#{@template}", :layout => :"#{@layout}"
+      erb :"#{@template}", :layout => :formlayout
     end
   end
 

lib/views/tech-issues/tech_issue_layout.erb → lib/views/formlayout.erb

@@ -14,9 +14,11 @@
         <hgroup><h1><%= @header %></h1></hgroup>
       </header>
 
-      <%= erb :menu %>
+      <div role="complementary">
+        <%= erb :menu %>
+      </div>
 
-      <div id="form">
+      <div id="form" role="main">
         <%= erb @header_message %>
         <%= erb :errors %>
         <form name="input" method="post">
@@ -34,7 +36,6 @@
   </section>
 </div>
 
-
 </body>