half survey module form changed to new ui plus one calendar fix

This commit is contained in:
Harry Bomrah 2013-08-20 18:36:58 +08:00 committed by saurabhbhatia
parent bd3462df7f
commit e45b7e09a0
9 changed files with 109 additions and 75 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@ -16,16 +16,16 @@
<div class="input-area"> <div class="input-area">
<!-- Module Tabs --> <!-- Module Tabs -->
<div class="nav-name"><strong>Module</strong></div> <div class="nav-name"><strong><%= t(:module) %></strong></div>
<ul class="nav nav-pills module-nav"> <ul class="nav nav-pills module-nav">
<li class="active"> <li class="active">
<a href="#basic" data-toggle="tab">Basic</a> <a href="#basic" data-toggle="tab"><%= t(:basic) %></a>
</li> </li>
<li> <li>
<a href="#status" data-toggle="tab">Status</a> <a href="#status" data-toggle="tab"><%= t(:status) %></a>
</li> </li>
<li> <li>
<a href="#tag" data-toggle="tab">Tags</a> <a href="#tag" data-toggle="tab"><%= t(:tags) %></a>
</li> </li>
</ul> </ul>
@ -232,3 +232,4 @@
}); });
</script> </script>
<% end %> <% end %>

View File

@ -1,7 +1,6 @@
<%= flash_messages %> <%= flash_messages %>
<div id="poststuff"> <div id="poststuff">
<h1><%= t('qa.new_faq') %></h1>
<%= form_for @qa, :url => panel_faq_back_end_qas_path, :html => {:class => 'form-horizontal main-forms'} do |f| %> <%= form_for @qa, :url => panel_faq_back_end_qas_path, :html => {:class => 'form-horizontal main-forms'} do |f| %>
<%= render :partial => 'form', :locals => {:f => f} %> <%= render :partial => 'form', :locals => {:f => f} %>
<% end %> <% end %>

View File

@ -1,75 +1,110 @@
<% # encoding: utf-8 %> <% content_for :page_specific_css do %>
<div id= "poststuff"> <%= stylesheet_link_tag "lib/main-forms" %>
<%= stylesheet_link_tag "lib/fileupload" %>
<%= stylesheet_link_tag "lib/main-list" %>
<% end %>
<% content_for :page_specific_javascript do %>
<%= javascript_include_tag "lib/bootstrap-fileupload" %>
<%= javascript_include_tag "lib/bootstrap-datetimepicker" %>
<%= javascript_include_tag "lib/datetimepicker/datetimepicker.js" %>
<%= javascript_include_tag "lib/modal-preview" %>
<%= javascript_include_tag "lib/file-type" %>
<% end %>
<%= f.error_messages %>
<fieldset>
<div class="input-area">
<div class="nav-name"><strong><%= t(:module) %></strong></div>
<ul class="nav nav-pills module-nav">
<li class="active">
<a href="#basic" data-toggle="tab"><%= t(:basic) %></a>
</li>
<li>
<a href="#redirect" data-toggle="tab"><%= t('survey.redirect') %></a>
</li>
</ul>
<%= f.error_messages %> <div class="tab-content module-area">
<div id="sub-wiget"> <!-- Basic Module -->
<div id="widget-date" class="widget-box widget-size-300"> <div class="tab-pane fade in active" id="basic">
<div class="widget-action clear tip" title="Set the announcement to start and end dates"> <div class="input-area">
<a href="#" class="action"><i class="icon-exclamation-sign icon-white"></i></a>
</div>
<h3 class="widget-title"><i class="icons-calendar"></i><%= t(:date_) %></h3>
<div class="widget-content clear">
<div class="control-group"> <div class="control-group">
<%= f.datetime_picker :postdate, :picker_type => 'separated', :label => t('survey.postdate') %> <label class="control-label muted"><%= t(:start) %></label>
<div class="controls">
<%= f.datetime_picker :postdate, :no_label => true %>
</div> </div>
</div>
<div class="control-group"> <div class="control-group">
<%= f.datetime_picker :deadline, :picker_type => 'separated', :label => t('survey.deadline') %> <label class="control-label muted"><%= t(:end) %></label>
<div class="controls">
<%= f.datetime_picker :deadline, :no_label => true %>
</div> </div>
</div> </div>
</div> </div>
<div id="widget-redirect" class="widget-box widget-size-300">
<div class="widget-action clear tip">
<a href="#" class="action"><i class="icon-exclamation-sign icon-white"></i></a>
</div> </div>
<h3 class="widget-title"><i class="icons-calendar"></i><%= t('survey.redirect') %></h3> <div class="tab-pane fade" id="redirect">
<div class="widget-content clear"> <div class="input-area">
<div class="control-group"> <div class="control-group">
<%= f.label :redirect_mode, t('survey.redirect_mode')%> <label class="control-label muted"><%= t('survey.redirect_mode') %></label>
<div class="controls">
<%= f.check_box :redirect_mode %> <%= f.check_box :redirect_mode %>
</div> </div>
</div>
<div class="control-group"> <div class="control-group">
<%= f.label :redirect_url, t('survey.redirect_url') %> <label class="control-label muted"><%= t('survey.redirect_url') %></label>
<div class="controls">
<%= f.text_field :redirect_url %> <%= f.text_field :redirect_url %>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div id="post-body"> </div>
<div id="post-body-content" class="clear"> <div class="nav-name"><strong>Language</strong></div>
<ul class="nav nav-tabs"> <ul class="nav nav-pills language-nav">
<% @site_valid_locales.each_with_index do |locale, i| %> <% @site_valid_locales.each_with_index do |locale, i| %>
<li <%= ( i == 0 ) ? "class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li> <li <%= ( i == 0 ) ? "class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
<% end %> <% end %>
</ul> </ul>
<div class="tab-content">
<!-- Language -->
<div class="tab-content language-area">
<% @site_valid_locales.each_with_index do |locale, i| %> <% @site_valid_locales.each_with_index do |locale, i| %>
<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>"> <div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
<div class="title"> <div class="control-group input-title">
<%= f.label :title , t('survey.title') %> <%= f.label :title , t('survey.question'), :class=>"control-label muted" %>
<div class="controls">
<%= f.fields_for :title_translations do |f| %> <%= f.fields_for :title_translations do |f| %>
<%= I18nVariable.from_locale(locale) %> <%= f.text_field locale, :class=>'post-title', :value => (@survey.title_translations[locale] rescue nil) %>
<%= f.text_field locale, :style=>"width:98%;", :class=>'post-title', :value => (@survey.title_translations[locale] rescue nil) %>
<% end %> <% end %>
</div> </div>
</div>
<div class="description"> <div class="control-group input-content">
<%= f.label :description ,t('survey.description') %> <%= f.label :description ,t('survey.description'), :class => "control-label muted" %>
<%= f.fields_for :description_translations do |f| %> <%= f.fields_for :description_translations do |f| %>
<%= I18nVariable.from_locale(locale) %> <div class="controls">
<%= f.text_area locale, :rows => 5, :style=>"width:98%;", :value => (@survey.description_translations[locale] rescue nil) %> <div class="textarea">
<%= f.text_area locale, :style=>"width:100%", :class => 'ckeditor input-block-level', :value => (@survey.description_translations[locale] rescue nil) %>
</div>
</div>
<% end %> <% end %>
</div> </div>
</div> </div>
<% end %> <% end %>
</div> </div>
</div>
</fieldset>
<div id= "poststuff">
<div id="post-body">
<div id="post-body-content" class="clear">
<div class="main-widget"> <div class="main-widget">
<div id="survey_questions_wrapper"> <div id="survey_questions_wrapper">
<div id='survey_questions' class="survey_questions_block"> <div id='survey_questions' class="survey_questions_block">

View File

@ -1,7 +1,6 @@
<%= flash_messages %> <%= flash_messages %>
<div id="poststuff"> <div id="poststuff">
<h1><%= t('survey.new_survey') %></h1> <%= form_for @survey, :url => panel_survey_back_end_surveys_path, :html => {:class => 'form-horizontal main-forms'} do |f| %>
<%= form_for @survey, :url => panel_survey_back_end_surveys_path, :html => {:class => 'clear'} do |f| %>
<%= render :partial => 'form', :locals => {:f => f} %> <%= render :partial => 'form', :locals => {:f => f} %>
<% end %> <% end %>
</div> </div>