diff --git a/app/assets/stylesheets/admin/store.scss b/app/assets/stylesheets/admin/store.scss new file mode 100644 index 0000000..4a53956 --- /dev/null +++ b/app/assets/stylesheets/admin/store.scss @@ -0,0 +1,258 @@ +.panel{ + position: relative; + border-radius: 5px; + overflow: hidden; + border: 1px solid #DFDFDF; + background: #FFF; + box-shadow: 0px 0px 10px #CCC; + .installed-templates-search, + .templates-store-search { + position: absolute; + top: 5px; + right: 5px; + @media screen and (max-width: 479px) { + .search { + width: 130px; + } + } + } +} + +.break{ + border-left: 1px solid #FCFCFC; + border-right: 1px solid #DDD; + padding: 10px 0; + margin: 0 15px; +} +.panel-heading{ + font-size: 16px; + color: #666; + padding: 10px 20px; + height: 20px; + + background-color: #fafafa; + background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2)); + background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2); + background-image: -o-linear-gradient(top, #ffffff, #f2f2f2); + background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); + *zoom: 1; + border-bottom: 1px solid #DDD; + & > ul { + list-style: none; + margin: 0; + padding: 0; + } + li { + display: inline-block; + border-right: 1px solid #FCFCFC; + margin-top: -10px; + padding-top: 10px; + padding-right: 15px; + padding-bottom: 10px; + & + li { + border-left: 1px solid #DDD; + margin-left: -3px; + padding-left: 15px; + } + &:last-child { + border-right: none; + } + &.active { + a { + color: #0088cc; + } + } + @media screen and (max-width: 767px) { + .translation_missing { + display: none; + } + } + } + a { + color: #666; + &:hover { + text-decoration: none; + } + } +} + +.table{ + margin: 0; + -webkit-border-radius: 5px; + border-radius: 5px; + .toggle-control { + margin-bottom: 0; + } +} + +.table td{ + vertical-align: middle; +} + +.table td img{ + background: #666; + border: 3px solid #AAA; + padding: 2px; + border-radius: 5px; + box-shadow: 0px 0px 10px #000 inset; +} + +.pannel-body { + padding: 15px 0; + .pannel-body-inner { + min-height: 400px; + max-height: 600px; + padding: 0 15px; + overflow: auto; + } +} +.store-item-list { + &:after { + content: ''; + clear: both; + display: table; + } + .store-item { + float: left; + padding: 5px; + box-sizing: border-box; + border-style: solid; + border-color: #ededed; + border-width: 0; + border-top-width: 1px; + border-bottom-width: 1px; + border-right-width: 1px; + @media screen and (min-width: 996px) { + width: 25%; + &:nth-child(n+5) { + border-top-width: 0; + } + &:nth-child(4n+1) { + border-left-width: 1px; + } + } + @media screen and (min-width: 768px) and (max-width: 995px) { + width: 33%; + &:nth-child(n+4) { + border-top-width: 0; + } + &:nth-child(3n+1) { + border-left-width: 1px; + } + } + @media screen and (min-width: 480px) and (max-width: 767px) { + width: 50%; + &:nth-child(n+3) { + border-top-width: 0; + } + &:nth-child(2n+1) { + border-left-width: 1px; + } + } + @media screen and (max-width: 479px) { + width: 100%; + border-left-width: 1px; + & + .store-item { + border-top-width: 0; + } + } + &:after { + content: ''; + clear: both; + display: table; + } + } + .app-pic { + float: left; + width: 80px; + height: 80px; + margin-right: 10px; + overflow: hidden; + border-radius: 3px; + } + .app-name, + .app-author, + .app-category { + width: calc(100% - 90px); + margin-top: 0; + margin-bottom: 3px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + .app-name { + a { + color: #333; + &:hover { + text-decoration: none; + } + } + } + .app-category { + color: #C3C3C3; + } +} + +.pannel-footer{ + background: #f2f2f2; /* Old browsers */ + background: -moz-linear-gradient(top, #f2f2f2 0%, #ffffff 76%, #ededed 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f2f2f2), color-stop(76%,#ffffff), color-stop(100%,#ededed)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #f2f2f2 0%,#ffffff 76%,#ededed 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #f2f2f2 0%,#ffffff 76%,#ededed 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #f2f2f2 0%,#ffffff 76%,#ededed 100%); /* IE10+ */ + background: linear-gradient(to bottom, #f2f2f2 0%,#ffffff 76%,#ededed 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f2f2f2', endColorstr='#ededed',GradientType=0 ); /* IE6-9 */ + + border: 1px solid #EEE; + border-top: 1px solid #CCC; + padding: 10px; + + height: 30px; +} + +#apply_change_btn{ + display: none; +} + +#alert_wrap{ + display: none; + position: absolute; + width: 93%; + top: 30%; + z-index: 1045; +} + +.alert{ + width: 400px; + text-align: center; + z-index: 1050; + margin: 0 auto; + padding: 20px 0; +} + +#delete_confirm_wrap{ + display: none; + position: absolute; + width: 93%; + top: 30%; + z-index: 1045; +} + +#delete_confirm_wrap .alert{ + width: 260px; + text-align: left; + padding: 20px; + font-size: 14px; + line-height: 32px; +} + +.modal-backdrop{ + display: none; +} + +.icons-faq:before{ content: "\e086"; } +.icons-ask:before { content: "\e062"; } +.icons-survey:before { content: "\e070"; } \ No newline at end of file diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 317bc7a..7ea2111 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -158,7 +158,7 @@ class MembersController < ApplicationController plugin_datas = plugin_data.where(:is_hidden=>false).desc(:year).collect do |p| { - "pd_datas" => [{ "data_title" => "#{p.create_link}" }] + "pd_datas" => [{ "data_title" => "#{p.create_link}" }] } end diff --git a/app/helpers/orbit_backend_helper.rb b/app/helpers/orbit_backend_helper.rb index 25eb17a..438e48f 100644 --- a/app/helpers/orbit_backend_helper.rb +++ b/app/helpers/orbit_backend_helper.rb @@ -23,6 +23,7 @@ module OrbitBackendHelper options[:icon_date] ||= 'icons-calendar' options[:icon_clear] ||= 'icons-cross-3' options[:input_class] ||= 'input-large' + options[:new_record] = true if options[:new_record].nil? options[:value] ||= options[:object].send(method) if options[:object] && options[:object][method] case options[:picker_type] when 'date' @@ -50,7 +51,8 @@ module OrbitBackendHelper def default_picker(object_name, method, options) custom = {} custom[:format] = options[:format] || 'yyyy/MM/dd hh:mm' - custom[:value] = format_value(options[:value], custom[:format]) if options[:value] + custom[:value] = format_value(options[:value], custom[:format]) if options[:value] && !options[:new_record] + custom[:value] = "" if options[:new_record] custom[:picker_class] = 'default_picker' custom[:label] = options[:label] || I18n.t('datetime_picker.default.label') custom[:placeholder] = options[:placeholder] || I18n.t('datetime_picker.default.placeholder') @@ -95,8 +97,8 @@ module OrbitBackendHelper render :partial => '/admin/tags/tag_form', :locals => {:f=> f, :module_app=>module_app, :tags=>module_app.tags } end - def render_filter(fields, search_dom_id=nil) - render :partial => "shared/filter", :locals =>{:fields => fields, :search_dom_id=>search_dom_id} + def render_filter(fields, search_dom_id=nil, quick_new=false) + render :partial => "shared/filter", :locals =>{:fields => fields, :search_dom_id=>search_dom_id, :quick_new=>quick_new} end def display_visitors(options={}) diff --git a/app/helpers/orbit_form_helper.rb b/app/helpers/orbit_form_helper.rb index 05ffc2e..eaad8e2 100644 --- a/app/helpers/orbit_form_helper.rb +++ b/app/helpers/orbit_form_helper.rb @@ -103,6 +103,6 @@ module Orbit::FormBuilder # ActionPack's metaprogramming would have done this for us, if FormHelper#labeled_input # had been defined at load. Instead we define it ourselves here. def datetime_picker(method, options = {}) - @template.datetime_picker(@object_name, method, objectify_options(options)) + # @template.datetime_picker(@object_name, method, objectify_options(options)) end end \ No newline at end of file diff --git a/app/helpers/orbit_helper.rb b/app/helpers/orbit_helper.rb index c23e2d6..9bd7eb1 100644 --- a/app/helpers/orbit_helper.rb +++ b/app/helpers/orbit_helper.rb @@ -136,7 +136,7 @@ module OrbitHelper end def self.set_widget_tags(tags) - @widget_tags = tags; + @widget_tags = tags end def self.widget_tags diff --git a/app/templates/orbit_bootstrap/modules/announcement/annc_index1.html.erb b/app/templates/orbit_bootstrap/modules/announcement/annc_index1.html.erb index d9a8168..1291f72 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/annc_index1.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/annc_index1.html.erb @@ -1,4 +1,4 @@ -
+

{{page-title}}

diff --git a/app/templates/orbit_bootstrap/modules/announcement/annc_index2.html.erb b/app/templates/orbit_bootstrap/modules/announcement/annc_index2.html.erb index e4338f2..6758b88 100644 --- a/app/templates/orbit_bootstrap/modules/announcement/annc_index2.html.erb +++ b/app/templates/orbit_bootstrap/modules/announcement/annc_index2.html.erb @@ -1,4 +1,4 @@ -
+

{{page-title}}

  • diff --git a/app/templates/orbit_bootstrap/partial/_head.html.erb b/app/templates/orbit_bootstrap/partial/_head.html.erb index c4e5e11..35d565a 100644 --- a/app/templates/orbit_bootstrap/partial/_head.html.erb +++ b/app/templates/orbit_bootstrap/partial/_head.html.erb @@ -3,11 +3,12 @@ <%= favicon_link_tag (current_site.favicon.blank? ? 'favicon.ico' : current_site.favicon.url) %> <%= render_site_title %> - <%= stylesheet_link_tag "fontawesome/font-awesome"%> - <%= stylesheet_link_tag "bootstrap/bootstrap"%> + <%= stylesheet_link_tag "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.1.0/css/font-awesome.min.css"%> + <%= stylesheet_link_tag "https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.2/css/bootstrap.min.css"%> <%= stylesheet_link_tag "template/template"%> - <%= javascript_include_tag "lib/jquery-1.11.0.min"%> - <%= javascript_include_tag "bootstrap"%> + <%#= javascript_include_tag "lib/jquery-1.11.0.min"%> + <%= javascript_include_tag "https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.0/jquery.min.js"%> + <%= javascript_include_tag "https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.2/js/bootstrap.min.js"%> <%= javascript_include_tag "plugin/modernizr"%> <%= javascript_include_tag "plugin/jquery-bullseye-min"%> <%= javascript_include_tag "plugin/jquery.cycle2.min"%> diff --git a/app/views/admin/designs/_design.html.erb b/app/views/admin/designs/_design.html.erb index 9b92116..c1ad137 100644 --- a/app/views/admin/designs/_design.html.erb +++ b/app/views/admin/designs/_design.html.erb @@ -1,9 +1,9 @@
- - - + + + - <%= render :partial => 'design', :collection => @designs %> \ No newline at end of file diff --git a/app/views/admin/designs/index.html.erb b/app/views/admin/designs/index.html.erb index 7ab5ccc..70a47c1 100644 --- a/app/views/admin/designs/index.html.erb +++ b/app/views/admin/designs/index.html.erb @@ -1,122 +1,14 @@ - <%= stylesheet_link_tag "lib/wrap-nav"%> - <%= stylesheet_link_tag "lib/main-list"%> - <%= stylesheet_link_tag "lib/mt-list"%> - <%= stylesheet_link_tag "lib/filter"%> - <%= stylesheet_link_tag "lib/togglebox"%> + <%= stylesheet_link_tag "lib/wrap-nav"%> + <%= stylesheet_link_tag "lib/main-list"%> + <%= stylesheet_link_tag "lib/mt-list"%> + <%= stylesheet_link_tag "lib/filter"%> + <%= stylesheet_link_tag "lib/togglebox"%> + <%= stylesheet_link_tag "admin/store"%> - <%= javascript_include_tag 'lib/footable-0.1' %> - <%= javascript_include_tag 'lib/all-list' %> - <%= javascript_include_tag 'lib/retina' %> - + <%= javascript_include_tag 'lib/footable-0.1' %> + <%= javascript_include_tag 'lib/all-list' %> + <%= javascript_include_tag 'lib/retina' %> @@ -129,53 +21,56 @@ <%= image_tag("preloader.gif", size: "50") %> - -
- -
-
-
<%= t(:installed_templates) %>
-
+
+
+ +
+
+
+
+ +
+
-
<%= design['title'] %>
+ <%= design['title'] %> 		-

<%= design['author'] %>

+ <%= design['author'] %> 		<%= radio_button_tag 'design_default', design['key'], (current_site.template && current_site.template.eql?(design['key']) ? true : false), :class => 'design_default toggle-check', :rel => admin_site_change_design_path(:site_id=>current_site.id, :design_key=>design['key']) %> diff --git a/app/views/admin/designs/_designs.html.erb b/app/views/admin/designs/_designs.html.erb index 16ff916..7a2c2b3 100644 --- a/app/views/admin/designs/_designs.html.erb +++ b/app/views/admin/designs/_designs.html.erb @@ -1,11 +1,10 @@
Templates TitleDesignerStatusTemplates TitleDesignerStatus
- - <%= render 'designs' %> - -
-
-
- + <%= render 'designs' %> +
+
- - -
-
-
<%= t(:template_store) %>
-
- <%= render :partial => "admin/store/store", :locals => {:section => "templates"} %> -
-
-
+
+
+
-
-
-
- - -
- <%#= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:upload), upload_package_admin_designs_path, :class => 'btn btn-primary pull-right' %> + <%= render :partial => "admin/store/store", :locals => {:section => "templates"} %> +
+
+ +
+ + + <%#= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:upload), upload_package_admin_designs_path, :class => 'btn btn-primary pull-right' %> + \ No newline at end of file diff --git a/app/views/admin/member_selects/select_emails.html.erb b/app/views/admin/member_selects/select_emails.html.erb index 69cdeb3..5cc4413 100644 --- a/app/views/admin/member_selects/select_emails.html.erb +++ b/app/views/admin/member_selects/select_emails.html.erb @@ -39,7 +39,7 @@ <% next if profile.email.nil? %>
  • <%= check_box_tag 'email_user_ids[]', profile.id , false %> diff --git a/app/views/admin/module_store/index.html.erb b/app/views/admin/module_store/index.html.erb index 1b1614f..a053f70 100644 --- a/app/views/admin/module_store/index.html.erb +++ b/app/views/admin/module_store/index.html.erb @@ -1,139 +1,14 @@ - <%= stylesheet_link_tag "lib/wrap-nav"%> - <%= stylesheet_link_tag "lib/main-list"%> - <%= stylesheet_link_tag "lib/mt-list"%> - <%= stylesheet_link_tag "lib/filter"%> - <%= stylesheet_link_tag "lib/togglebox"%> + <%= stylesheet_link_tag "lib/wrap-nav"%> + <%= stylesheet_link_tag "lib/main-list"%> + <%= stylesheet_link_tag "lib/mt-list"%> + <%= stylesheet_link_tag "lib/filter"%> + <%= stylesheet_link_tag "lib/togglebox"%> + <%= stylesheet_link_tag "admin/store"%> - <%= javascript_include_tag 'lib/footable-0.1' %> - <%= javascript_include_tag 'lib/all-list' %> - <%= javascript_include_tag 'lib/retina' %> - + <%= javascript_include_tag 'lib/footable-0.1' %> + <%= javascript_include_tag 'lib/all-list' %> + <%= javascript_include_tag 'lib/retina' %> <%= flash[:notice] rescue nil%> @@ -159,34 +34,32 @@ -
    - -
    -
    -
    <%= t(:installed_modules) %>
    -
    - - - -
    -
    -
    - -
    +
    +
    + +
    +
    +
    +
    +
    -
    - -
    -
    -
    <%= t(:module_store) %>
    -
    - <%= render :partial => "admin/store/store", :locals => {:section => "apps"} %> -
    -
    -
    -
    -
    -
    +
    + <%= render :partial => "admin/store/store", :locals => {:section => "apps"} %> +
    +
    +
    +