recurring_select 1.1.0 → 1.2.0

data/README.md

@@ -68,6 +68,54 @@ for IceCube. This is sometimes needed based on if you're receiving strings, fixe
 numbers, strings vs symbols, etc.
 `RecurringSelect.dirty_hash_to_rule(params)`
 
+I18n
+----
+Recurrent select is I18n aware
+
+You can create a locale file like this:
+
+```
+en:
+  recurring_select:
+    not_recurring: "- not recurring -"
+    change_schedule: "Change schedule..."
+    set_schedule: "Set schedule..."
+    new_custom_schedule: "New custom schedule..."
+    custom_schedule: "Custom schedule..."
+    or: or
+```
+
+You have to translate javascript texts too by including the locale file in your assets manifest. Only french and english are supported for the moment
+
+```
+//= require recurring_select/en
+//= require recurring_select/fr
+```
+
+For other languages include a file like this:
+
+```
+$.fn.recurring_select.texts = {
+  repeat: "Repeat"
+  frequency: "Frequency"
+  daily: "Daily"
+  weekly: "Weekly"
+  monthly: "Monthly"
+  yearly: "Yearly"
+  every: "Every"
+  days: "day(s)"
+  weeks_on: "week(s) on"
+  months: "month(s)"
+  years: "year(s)"
+  first_day_of_week: 1
+  day_of_month: "Day of month"
+  day_of_week: "Day of week"
+  cancel: "Cancel"
+  ok: "OK"
+  days_first_letter: ["S", "M", "T", "W", "T", "F", "S" ]
+  order: ["1st", "2nd", "3rd", "4th"]
+}
+```
 
 Testing and development
 ----------------------

data/app/assets/javascripts/recurring_select.js.coffee

@@ -72,3 +72,27 @@ $.fn.recurring_select = (method) ->
     return methods[ method ].apply( this, Array.prototype.slice.call( arguments, 1 ) );
   else
     $.error( "Method #{method} does not exist on jQuery.recurring_select" );
+
+$.fn.recurring_select.texts = {
+  repeat: "Repeat"
+  last_day: "Last Day"
+  frequency: "Frequency"
+  daily: "Daily"
+  weekly: "Weekly"
+  monthly: "Monthly"
+  yearly: "Yearly"
+  every: "Every"
+  days: "day(s)"
+  weeks_on: "week(s) on"
+  months: "month(s)"
+  years: "year(s)"
+  first_day_of_week: 1
+  day_of_month: "Day of month"
+  day_of_week: "Day of week"
+  cancel: "Cancel"
+  ok: "OK"
+  summary: "Summary"
+  first_day_of_week: 0
+  days_first_letter: ["S", "M", "T", "W", "T", "F", "S" ]
+  order: ["1st", "2nd", "3rd", "4th"]
+}

data/app/assets/javascripts/recurring_select/fr.js.coffee

@@ -0,0 +1,23 @@
+$.fn.recurring_select.texts = {
+  repeat: "Récurrence"
+  last_day: "Dernier jour"
+  frequency: "Fréquence"
+  daily: "Tous les jours"
+  weekly: "Toutes les semaines"
+  monthly: "Tous les mois"
+  yearly: "Tous les ans"
+  every: "Tous les"
+  days: "jour(s)"
+  weeks_on: "semaine(s) le"
+  months: "mois"
+  years: "année(s)"
+  cancel: "Annuler"
+  day_of_month: "Jour du mois"
+  day_of_week: "Jour de la semaine"
+  ok: "OK"
+  cancel: "Annuler"
+  summary: "Résumé"
+  first_day_of_week: 1
+  days_first_letter: ["D", "L", "M", "M", "J", "V", "S" ]
+  order: ["1er", "2ème", "3ème", "4ème"]
+}

data/app/assets/javascripts/recurring_select_dialog.js.coffee.erb

@@ -1,10 +1,3 @@
-<%
-  template_path = File.expand_path("../templates/recurring_select/dialog_template.html", File.dirname(__FILE__))
-  File.open(template_path) do |file|
-    @template = file.read
-  end
-%>
-
 window.RecurringSelectDialog =
   class RecurringSelectDialog
     constructor: (@recurring_selector) ->
@@ -20,11 +13,10 @@ window.RecurringSelectDialog =
 
       open_in = $("body")
       open_in = $(".ui-page-active") if $(".ui-page-active").length
-      open_in.append "<%= ActionController::Base.helpers.escape_javascript @template %>"
+      open_in.append @template()
       @outer_holder = $(".rs_dialog_holder")
       @inner_holder = @outer_holder.find ".rs_dialog"
       @content = @outer_holder.find ".rs_dialog_content"
-
       @positionDialogVert(true)
       @mainEventInit()
       @freqInit()
@@ -159,7 +151,7 @@ window.RecurringSelectDialog =
         @save_button.removeClass("disabled")
         rule_str = @current_rule.str.replace("*", "")
         if rule_str.length < 20
-          rule_str = "Summary: "+rule_str
+          rule_str = "#{$.fn.recurring_select.texts["summary"]}: "+rule_str
         @summary.find("span").html rule_str
       else
         @summary.addClass "fetching"
@@ -190,7 +182,7 @@ window.RecurringSelectDialog =
           day_link.addClass("selected")
 
       # add last day of month button
-      monthly_calendar.append (end_of_month_link = $(document.createElement("a")).text("Last Day"))
+      monthly_calendar.append (end_of_month_link = $(document.createElement("a")).text($.fn.recurring_select.texts["last_day"]))
       end_of_month_link.addClass("end_of_month")
       if $.inArray(-1, @current_rule.hash.validations.day_of_month) != -1
         end_of_month_link.addClass("selected")
@@ -200,8 +192,8 @@ window.RecurringSelectDialog =
     init_calendar_weeks: (section) =>
       monthly_calendar = section.find(".rs_calendar_week")
       monthly_calendar.html ""
-      row_labels = ["1st", "2nd", "3rd", "4th"]
-      cell_str = ["S", "M", "T", "W", "T", "F", "S"]
+      row_labels = $.fn.recurring_select.texts["order"]
+      cell_str = $.fn.recurring_select.texts["days_first_letter"]
 
       for num in [1..4]
         monthly_calendar.append "<span>#{row_labels[num - 1]}</span>"
@@ -235,19 +227,19 @@ window.RecurringSelectDialog =
       switch @freq_select.val()
         when "Weekly"
           @current_rule.hash.rule_type = "IceCube::WeeklyRule"
-          @current_rule.str = "Weekly"
+          @current_rule.str = $.fn.recurring_select.texts["weekly"]
           @initWeeklyOptions()
         when "Monthly"
           @current_rule.hash.rule_type = "IceCube::MonthlyRule"
-          @current_rule.str = "Monthly"
+          @current_rule.str = $.fn.recurring_select.texts["monthly"]
           @initMonthlyOptions()
         when "Yearly"
           @current_rule.hash.rule_type = "IceCube::YearlyRule"
-          @current_rule.str = "Yearly"
+          @current_rule.str = $.fn.recurring_select.texts["yearly"]
           @initYearlyOptions()
         else
           @current_rule.hash.rule_type = "IceCube::DailyRule"
-          @current_rule.str = "Daily"
+          @current_rule.str = $.fn.recurring_select.texts["daily"]
           @initDailyOptions()
       @summaryUpdate()
       @positionDialogVert()
@@ -277,7 +269,7 @@ window.RecurringSelectDialog =
       @current_rule.hash ||= {}
       @current_rule.hash.validations = {}
       raw_days = @content.find(".monthly_options .rs_calendar_day a.selected").map ->
-        res = if $(this).text() == "Last Day" then -1 else parseInt($(this).text())
+        res = if $(this).text() == $.fn.recurring_select.texts["last_day"] then -1 else parseInt($(this).text())
         res
       @current_rule.hash.validations.day_of_week = {}
       @current_rule.hash.validations.day_of_month = raw_days.get()
@@ -299,3 +291,76 @@ window.RecurringSelectDialog =
       @summaryUpdate()
       false
 
+# ========================= Change callbacks ===============================
+
+    template: () ->
+      str = "
+      <div class='rs_dialog_holder'>
+        <div class='rs_dialog'>
+          <div class='rs_dialog_content'>
+            <h1>#{$.fn.recurring_select.texts["repeat"]} <a href='#' title='#{$.fn.recurring_select.texts["cancel"]}' Alt='#{$.fn.recurring_select.texts["cancel"]}'></a> </h1>
+            <p>
+              <label for='rs_frequency'>#{$.fn.recurring_select.texts["frequency"]}:</label>
+              <select id='rs_frequency' class='rs_frequency' name='rs_frequency'>
+                <option value='Daily'>#{$.fn.recurring_select.texts["daily"]}</option>
+                <option value='Weekly'>#{$.fn.recurring_select.texts["weekly"]}</option>
+                <option value='Monthly'>#{$.fn.recurring_select.texts["monthly"]}</option>
+                <option value='Yearly'>#{$.fn.recurring_select.texts["yearly"]}</option>
+              </select>
+            </p>
+
+            <div class='daily_options freq_option_section'>
+              <p>
+                #{$.fn.recurring_select.texts["every"]}
+                <input type='text' name='rs_daily_interval' class='rs_daily_interval rs_interval' value='1' size='2' />
+                #{$.fn.recurring_select.texts["days"]}
+              </p>
+            </div>
+            <div class='weekly_options freq_option_section'>
+              <p>
+                #{$.fn.recurring_select.texts["every"]}
+                <input type='text' name='rs_weekly_interval' class='rs_weekly_interval rs_interval' value='1' size='2' />
+                #{$.fn.recurring_select.texts["weeks_on"]}:
+              </p>
+              <div class='day_holder'>
+      "
+      for day_of_week in [$.fn.recurring_select.texts["first_day_of_week"]...(7 + $.fn.recurring_select.texts["first_day_of_week"])]
+        day_of_week = day_of_week % 7
+        console.log day_of_week
+        str += "<a href='#' data-value='#{day_of_week}'>#{$.fn.recurring_select.texts["days_first_letter"][day_of_week]}</a>"
+
+      str += "
+              </div>
+              <span style='clear:both; visibility:hidden; height:1px;'>.</span>
+            </div>
+            <div class='monthly_options freq_option_section'>
+              <p>
+                #{$.fn.recurring_select.texts["every"]}
+                <input type='text' name='rs_monthly_interval' class='rs_monthly_interval rs_interval' value='1' size='2' />
+                #{$.fn.recurring_select.texts["months"]}:
+              </p>
+              <p class='monthly_rule_type'>
+                <span>#{$.fn.recurring_select.texts["day_of_month"]} <input type='radio' class='monthly_rule_type_day' name='monthly_rule_type' value='true' /></span>
+                <span>#{$.fn.recurring_select.texts["day_of_week"]} <input type='radio' class='monthly_rule_type_week' name='monthly_rule_type' value='true' /></span>
+              </p>
+              <p class='rs_calendar_day'></p>
+              <p class='rs_calendar_week'></p>
+            </div>
+            <div class='yearly_options freq_option_section'>
+              <p>
+                #{$.fn.recurring_select.texts["every"]}
+                <input type='text' name='rs_yearly_interval' class='rs_yearly_interval rs_interval' value='1' size='2' />
+                #{$.fn.recurring_select.texts["years"]}
+              </p>
+            </div>
+            <p class='rs_summary'>
+              <span></span>
+            </p>
+            <div class='controls'>
+              <input type='button' class='rs_save' value='#{$.fn.recurring_select.texts["ok"]}' />
+              <input type='button' class='rs_cancel' value='#{$.fn.recurring_select.texts["cancel"]}' />
+            </div>
+          </div>
+        </div>
+      </div>
+      "

data/app/assets/stylesheets/recurring_select.css.scss.erb

@@ -60,10 +60,10 @@ select {
           a.end_of_month { width: 81px; }
         }
         .rs_calendar_week {
-          width: 183px;
+          width: 191px;
           span {
             display: inline-block;
-            width: 27px;
+            width: 35px;
           }
         }
 

data/app/helpers/utilities/form_options_ext.rb

@@ -3,19 +3,19 @@ module RecurringSelectHelper
     def recurring_options_for_select(currently_selected_rule = nil, default_schedules = nil, options = {})
 
       options_array = []
-      blank_option_label = options[:blank_label] || "- not recurring -"
+      blank_option_label = options[:blank_label] || I18n.t("recurring_select.not_recurring")
       blank_option = [blank_option_label, "null"]
-      separator = ["or", {:disabled => true}]
+      separator = [I18n.t("recurring_select.or"), {:disabled => true}]
 
       if default_schedules.blank?
         if currently_selected_rule
           options_array << blank_option if options[:allow_blank]
           options_array << ice_cube_rule_to_option(currently_selected_rule)
           options_array << separator
-          options_array << ["Change schedule...", "custom"]
+          options_array << [I18n.t("recurring_select.change_schedule"), "custom"]
         else
           options_array << blank_option
-          options_array << ["Set schedule...", "custom"]
+          options_array << [I18n.t("recurring_select.set_schedule"), "custom"]
         end
       else
         options_array << blank_option if options[:allow_blank]
@@ -26,9 +26,9 @@ module RecurringSelectHelper
 
         if currently_selected_rule and not current_rule_in_defaults?(currently_selected_rule, default_schedules)
           options_array << ice_cube_rule_to_option(currently_selected_rule, true)
-          custom_label = ["New custom schedule...", "custom"]
+          custom_label = [I18n.t("recurring_select.new_custom_schedule"), "custom"]
         else
-          custom_label = ["Custom schedule...", "custom"]
+          custom_label = [I18n.t("recurring_select.custom_schedule"), "custom"]
         end
 
         options_array << separator

data/config/locales/en.yml

@@ -0,0 +1,8 @@
+en:
+  recurring_select:
+    not_recurring: "- not recurring -"
+    change_schedule: "Change schedule..."
+    set_schedule: "Set schedule..."
+    new_custom_schedule: "New custom schedule..."
+    custom_schedule: "Custom schedule..."
+    or: or

data/config/locales/fr.yml

@@ -0,0 +1,8 @@
+fr:
+  recurring_select:
+    not_recurring: "- non récurrent -"
+    change_schedule: "Modifier la récurrence..."
+    set_schedule: "Définir la récurrence..."
+    new_custom_schedule: "Nouvelle récurrence..."
+    custom_schedule: "Récurrence personnalisée..."
+    or: ou

data/lib/recurring_select.rb

@@ -1,14 +1,6 @@
 require "recurring_select/engine"
 require "ice_cube"
 
-#TODO: remove monkey patch when https://github.com/seejohnrun/ice_cube/issues/136 is fixed
-IceCube::ValidatedRule.class_eval do
-  alias old_to_s to_s
-  def to_s
-    old_to_s.gsub("when it is", "and")
-  end
-end
-
 module RecurringSelect
 
   def self.dirty_hash_to_rule(params)

data/lib/recurring_select/version.rb

@@ -1,3 +1,3 @@
 module RecurringSelect
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: recurring_select
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Jobber
@@ -10,11 +11,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,6 +24,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -29,6 +32,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -36,6 +40,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -43,6 +48,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_cube
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -50,6 +56,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -57,6 +64,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -64,6 +72,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -71,6 +80,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,6 +88,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -85,6 +96,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -92,6 +104,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -99,6 +112,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -106,6 +120,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -121,16 +136,18 @@ files:
 - app/assets/images/recurring_select/cancel.png
 - app/assets/images/recurring_select/throbber_13x13.gif
 - app/assets/javascripts/jquery-mobile-rs.js.coffee
+- app/assets/javascripts/recurring_select/fr.js.coffee
 - app/assets/javascripts/recurring_select.js.coffee
 - app/assets/javascripts/recurring_select_dialog.js.coffee.erb
 - app/assets/stylesheets/jquery-mobile-rs.css.scss.erb
 - app/assets/stylesheets/recurring_select.css.scss.erb
 - app/assets/stylesheets/utilities.scss
-- app/assets/templates/recurring_select/dialog_template.html
 - app/helpers/recurring_select_helper.rb
 - app/helpers/utilities/form_options_ext.rb
 - app/helpers/utilities/tag_ext.rb
 - app/middleware/recurring_select_middleware.rb
+- config/locales/en.yml
+- config/locales/fr.yml
 - config/routes.rb
 - lib/recurring_select/engine.rb
 - lib/recurring_select/version.rb
@@ -140,25 +157,27 @@ files:
 - README.md
 homepage: http://github.com/getjobber/recurring_select
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A select helper which gives you magical powers to generate ice_cube rules.
 test_files: []
+has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWJkOGI0NDIxNzQ1MzU4MTBmOGI1MGM4OTI3YThlZTQxNzQyNTIyMg==
-  data.tar.gz: !binary |-
-    NTM0NDE2OGRiZDYxOWFiZWM4ZjM4OTVhNDBiNGNmZGUzMGQ2NTNiYQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NGJhMzZhZTA3ZWFlNTg1OWQwNTVhMWE0MDIyYzJmYjQwM2NkNDllNDhlZGU0
-    NDA5ZjhjNzBhYWRhMGZhNzkwYmExMTkwYTgwMDIzOWM4ZjQwNjk5ZGJjMWE4
-    YzFkM2M4NWJhZjNmYWIxZTk2MDEzYjBhYjU3ZmUyM2QyMTY5M2U=
-  data.tar.gz: !binary |-
-    MmY2OGVhNzFlNWQ0NDgzOGZiYTAyN2NmNzk1OTA5NzkzOGQyY2Q5NDFmYzJl
-    OTkxZDhmYWU1MTJhOGM3OWQxMTk5ZWZiOTIwMzU2Njk4YzRmZTM1NjJiYTMz
-    Y2Q3ODRjNDc5ZDM2ZWMyYmNmNzkzYzA3ZDIwMGQwODYxODYyN2Y=

data/app/assets/templates/recurring_select/dialog_template.html

@@ -1,77 +0,0 @@
-<div class='rs_dialog_holder'>
-  <div class='rs_dialog'>
-    <div class='rs_dialog_content'>
-      <h1>Repeat <a href='#' title='Cancel' Alt='Cancel'></a> </h1>
-
-      <p>
-        <label for='rs_frequency'>Frequency:</label>
-        <select id='rs_frequency' class='rs_frequency' name='rs_frequency'>
-          <option value="Daily">Daily</option>
-          <option value="Weekly">Weekly</option>
-          <option value="Monthly">Monthly</option>
-          <option value="Yearly">Yearly</option>
-        </select>
-      </p>
-
-      <div class="daily_options freq_option_section">
-        <p>
-          Every
-          <input type='text' name='rs_daily_interval' class='rs_daily_interval rs_interval' value='1' size='2' />
-          day(s)
-        </p>
-      </div>
-
-      <div class="weekly_options freq_option_section">
-        <p>
-          Every
-          <input type='text' name='rs_weekly_interval' class='rs_weekly_interval rs_interval' value='1' size='2' />
-          week(s) on :
-        </p>
-        <div class="day_holder">
-          <a href="#" data-value='0'>S</a>
-          <a href="#" data-value='1'>M</a>
-          <a href="#" data-value='2'>T</a>
-          <a href="#" data-value='3'>W</a>
-          <a href="#" data-value='4'>T</a>
-          <a href="#" data-value='5'>F</a>
-          <a href="#" data-value='6'>S</a>
-        </div>
-
-        <span style="clear:both; visibility:hidden; height:1px;">.</span>
-      </div>
-
-      <div class="monthly_options freq_option_section">
-        <p>
-          Every
-          <input type='text' name='rs_monthly_interval' class='rs_monthly_interval rs_interval' value='1' size='2' />
-          month(s):
-        </p>
-        <p class="monthly_rule_type">
-          <span>Day of Month <input type="radio" class="monthly_rule_type_day" name="monthly_rule_type" value="true" /></span>
-          <span>Day of Week <input type="radio" class="monthly_rule_type_week" name="monthly_rule_type" value="true" /></span>
-        </p>
-        <p class="rs_calendar_day"></p>
-        <p class="rs_calendar_week"></p>
-      </div>
-
-      <div class="yearly_options freq_option_section">
-        <p>
-          Every
-          <input type='text' name='rs_yearly_interval' class='rs_yearly_interval rs_interval' value='1' size='2' />
-          year(s)
-        </p>
-      </div>
-
-
-      <p class='rs_summary'>
-        <span></span>
-      </p>
-
-      <div class="controls">
-        <input type="button" class="rs_save" value='OK' />
-        <input type="button" class="rs_cancel" value='Cancel' />
-      </div>
-
-    </div>
-  </div>
-</div>