Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity

This commit is contained in:
Harry Bomrah 2015-02-26 14:55:05 +05:30
commit 297ed49447
21 changed files with 401 additions and 355 deletions

View File

@ -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"; }

View File

@ -158,7 +158,7 @@ class MembersController < ApplicationController
plugin_datas = plugin_data.where(:is_hidden=>false).desc(:year).collect do |p|
{
"pd_datas" => [{ "data_title" => "<a href='#{OrbitHelper.url_to_plugin_show(p.to_param,plugin.module_app_name.underscore)}'>#{p.create_link}" }]
"pd_datas" => [{ "data_title" => "<a href='#{OrbitHelper.url_to_plugin_show(p.to_param,plugin.module_app_name.underscore)}' target='_blank'>#{p.create_link}" }]
}
end

View File

@ -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={})

View File

@ -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

View File

@ -136,7 +136,7 @@ module OrbitHelper
end
def self.set_widget_tags(tags)
@widget_tags = tags;
@widget_tags = tags
end
def self.widget_tags

View File

@ -1,4 +1,4 @@
<div class="i-annc index-announcement-1">
<div class="i-annc index-announcement-1 {{display}}">
<h3 class="i-annc__page-title">{{page-title}}</h3>
<table class="i-annc__table table table-striped">
<thead>

View File

@ -1,4 +1,4 @@
<div class="i-annc index-announcement-2">
<div class="i-annc index-announcement-2 {{display}}">
<h3 class="i-annc__page-title">{{page-title}}</h3>
<ul class="i-annc__list" data-level="0" data-list="announcements">
<li class="i-annc__item">

View File

@ -3,11 +3,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
<%= favicon_link_tag (current_site.favicon.blank? ? 'favicon.ico' : current_site.favicon.url) %>
<title><%= render_site_title %></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"%>

View File

@ -1,9 +1,9 @@
<tr>
<td class="detail-row">
<h5 class="mt_title"><span><%= design['title'] %></span></h5>
<span class="mt_title"><%= design['title'] %></span>
</td>
<td>
<p class="mt_dev"><%= design['author'] %></p>
<spna class="mt_dev"><%= design['author'] %></span>
</td>
<td class="active">
<%= 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']) %>

View File

@ -1,11 +1,10 @@
<thead>
<tr class="sort-header">
<th class="first span4">Templates Title</th>
<th class="active span3">Designer</th>
<th class="span2">Status</th>
<th class="">Templates Title</th>
<th class="">Designer</th>
<th class="">Status</th>
</tr>
</thead>
<tbody>
<tbody id="tbody_designs" class="sort-holder">
<%= render :partial => 'design', :collection => @designs %>
</tbody>

View File

@ -1,122 +1,14 @@
<head>
<%= 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' %>
<style type="text/css">
.container{
/*max-width: 600px;*/
}
.panel{
border-radius: 5px;
overflow: hidden;
border: 1px solid #DFDFDF;
background: #FFF;
box-shadow: 0px 0px 10px #CCC;
}
.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;
}
.table{
margin: 0;
-webkit-border-radius: 5px;
border-radius: 5px;
}
/* .table td, .table th, .table .quick-edit{
vertical-align: middle;
text-align: center;
}
*/
/*.table td img{
background: #666;
border: 3px solid #AAA;
padding: 2px;
border-radius: 5px;
box-shadow: 0px 0px 10px #000 inset;
}
*/
.pannel-body{
min-height: 400px;
overflow: scroll;
overflow-x: hidden;
overflow-y: hidden;
padding: 15px;
}
.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: 10px 0;
}
.modal-backdrop{
display: none;
}
.icons-faq:before{ content: "\e086"; }
.icons-ask:before { content: "\e062"; }
</style>
<%= javascript_include_tag 'lib/footable-0.1' %>
<%= javascript_include_tag 'lib/all-list' %>
<%= javascript_include_tag 'lib/retina' %>
</head>
@ -129,53 +21,56 @@
<%= image_tag("preloader.gif", size: "50") %>
</div>
</div>
<div class="container row-fluid">
<div class="span4">
<div class="panel">
<div class="panel-heading"><i class="icons-download"></i><span class="break"></span><%= t(:installed_templates) %></div>
<div class="pannel-body">
<div class="templates-store panel">
<div class="panel-heading">
<ul>
<li class="active">
<a href="#installed_templates" data-toggle="tab">
<i class="icons-download"></i><%= t(:installed_templates) %>
</a>
</li>
<li>
<a href="#template_store" data-toggle="tab">
<i class="icon-shopping-cart"></i><%= t(:template_store) %>
</a>
</li>
</ul>
</div>
<div class="pannel-body tab-content">
<div class="tab-pane fade active in" id="installed_templates">
<div class="installed-templates-search">
<input class="search" type="text" />
</div>
<div class="pannel-body-inner">
<table class="table table-striped">
<tbody id="extensions_table">
<%= render 'designs' %>
</tbody>
</table>
</div>
<div class="pannel-footer">
<button id="apply_change_btn" onclick="apply_change();" class="btn btn-primary btn-small pull-right">Apply Change</button>
<%= render 'designs' %>
</table>
</div>
<button id="apply_change_btn" onclick="apply_change();" class="btn btn-primary btn-small pull-right">Apply Change</button>
</div>
</div>
<div class="span8 pull-right">
<div class="panel">
<div class="panel-heading"><i class="icon-shopping-cart"></i><span class="break"></span><%= t(:template_store) %></div>
<div class="pannel-body">
<%= render :partial => "admin/store/store", :locals => {:section => "templates"} %>
</div>
<div class="pannel-footer">
</div>
<div class="tab-pane fade" id="template_store">
<div class="templates-store-search">
<input class="search" type="text" />
</div>
</div>
</div>
<div class="modal-backdrop"></div>
</table>
<div class="form-actions form-fixed pagination-right">
<%#= 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"} %>
</div>
</div>
</div>
<div class="modal-backdrop"></div>
<!-- <div class="form-actions form-fixed pagination-right"> -->
<%#= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:upload), upload_package_admin_designs_path, :class => 'btn btn-primary pull-right' %>
<!-- </div> -->
<script type="text/javascript">
$(document).on('change', '.design_default', function(){
$("#alert_wrap").show();
$(".modal-backdrop").show();
$(this).attr('value');
// console.log($(this).attr('rel') + '/' + $(this).val());
$.getScript($(this).attr('rel'),function(){
$("#alert_wrap").hide();
$(".modal-backdrop").hide();
});
$(document).on('change', '.design_default', function(){
$("#alert_wrap").show();
$(".modal-backdrop").show();
$(this).attr('value');
// console.log($(this).attr('rel') + '/' + $(this).val());
$.getScript($(this).attr('rel'),function(){
$("#alert_wrap").hide();
$(".modal-backdrop").hide();
});
});
</script>

View File

@ -39,7 +39,7 @@
<% next if profile.email.nil? %>
<li class="check-item">
<label>
<%= image_tag (profile.avatar.file ? profile.avatar : "menber-pic.png"), class: "user-pic" %>
<%= image_tag (profile.avatar.file ? profile.avatar : "member-pic.png"), class: "user-pic" %>
<span class="user-name"><%= profile.name %></span>
</label>
<%= check_box_tag 'email_user_ids[]', profile.id , false %>

View File

@ -1,139 +1,14 @@
<head>
<%= 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' %>
<style type="text/css">
.container{
/*max-width: 600px;*/
}
.panel{
border-radius: 5px;
overflow: hidden;
border: 1px solid #DFDFDF;
background: #FFF;
box-shadow: 0px 0px 10px #CCC;
}
.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;
}
.table{
margin: 0;
-webkit-border-radius: 5px;
border-radius: 5px;
}
.table td{
vertical-align: middle;
text-align: center;
}
.table td img{
background: #666;
border: 3px solid #AAA;
padding: 2px;
border-radius: 5px;
box-shadow: 0px 0px 10px #000 inset;
}
.pannel-body{
min-height: 400px;
overflow: scroll;
overflow-x: hidden;
overflow-y: hidden;
padding: 15px;
}
.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"; }
</style>
<%= javascript_include_tag 'lib/footable-0.1' %>
<%= javascript_include_tag 'lib/all-list' %>
<%= javascript_include_tag 'lib/retina' %>
</head>
<%= flash[:notice] rescue nil%>
@ -159,34 +34,32 @@
</div>
</div>
<div class="container row-fluid">
<div class="span4">
<div class="panel">
<div class="panel-heading"><i class="icons-download"></i><span class="break"></span><%= t(:installed_modules) %></div>
<div class="pannel-body">
<table class="table table-striped">
<tbody id="extensions_table">
</tbody>
</table>
</div>
<div class="pannel-footer">
<button id="apply_change_btn" onclick="apply_change();" class="btn btn-primary btn-small pull-right"><%= t(:apply_change) %></button>
</div>
<div class="module-store panel">
<div class="panel-heading">
<ul>
<li class="active">
<a href="#installed_modules" data-toggle="tab">
<i class="icons-download"></i><%= t(:installed_modules) %>
</a>
</li>
<li>
<a href="#module_store" data-toggle="tab">
<i class="icon-shopping-cart"></i><%= t(:module_store) %>
</a>
</li>
</ul>
</div>
<div class="pannel-body tab-content">
<div class="tab-pane fade active in" id="installed_modules">
<table class="table table-striped"></table>
<button id="apply_change_btn" onclick="apply_change();" class="btn btn-primary btn-small pull-right"><%= t(:apply_change) %></button>
</div>
</div>
<div class="span8 pull-right">
<div class="panel">
<div class="panel-heading"><i class="icon-shopping-cart"></i><span class="break"></span><%= t(:module_store) %></div>
<div class="pannel-body">
<%= render :partial => "admin/store/store", :locals => {:section => "apps"} %>
</div>
<div class="pannel-footer">
</div>
</div>
</div>
<div class="modal-backdrop"></div>
<div class="tab-pane fade" id="module_store">
<%= render :partial => "admin/store/store", :locals => {:section => "apps"} %>
</div>
</div>
</div>
<div class="modal-backdrop"></div>
<script type="text/javascript">
var toggle_modules = new Array();

View File

@ -21,13 +21,14 @@
line-height: 20px;
}
</style>
<div id="store-area">
<div class="loading-store">
<%= image_tag("preloader.gif", size: "50") %>
<p class="loading-status"></p>
<p> Please wait ... </p>
</div>
<div class="form-area">
<div class="pannel-body-inner">
<div class="store-item-list" id="store-area">
<div class="loading-store">
<%= image_tag("preloader.gif", size: "50") %>
<p class="loading-status"></p>
<p> Please wait ... </p>
</div>
<div class="form-area"></div>
</div>
</div>

View File

@ -1 +1,14 @@
This is template store.
<% 55.times do %>
<div class="store-item">
<div class="app-pic">
<a href="">
<%= image_tag("http://fakeimg.pl/80x80/ff0000/ffffff/?text=World&font=lobster") %>
</a>
</div>
<h4 class="app-name">
<a href="">App Name</a>
</h4>
<p class="app-author">Rulingcom</p>
<p class="app-category">category</p>
</div>
<% end %>

View File

@ -1,13 +1,15 @@
<% content_for :right_nav do %>
<% if !search_dom_id.nil?%>
<div class="searchClear pull-left" style="clear: left;">
<% if quick_new %>
<%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add), request.original_fullpath + '/new', class: "btn btn-primary pull-left", style: "clear: left;"%>
<% end %>
<div class="searchClear pull-left" <% if !quick_new %>style="clear: left;"<% end %>>
<form id="module-search-form">
<input type="text" id="filter-input" class="search-query input-medium" placeholder="<%= t(:search_) %>" value="<%=params[:keywords]%>">
</form>
<img id="search-preloader" src="/assets/preloader.gif" style="height: 40px; position: absolute; left: 220px; top: -5px; display:none;">
</div>
<% end %>
<ul class="nav nav-pills filter-nav pull-right">
<% fields.keys.each do |field| %>
<li class="accordion-group">

View File

@ -15,5 +15,5 @@
</style>
<div class="license-denied-wrap">
<h3 class="license-denied">License Denied.</h3>
<p class="">Please contact <a href="http://www.rulingdigital.com">www.rulingdigital.com</a>.</p>
<p class="">Please contact <a href="http://www.rulingcom.com">www.rulingcom.com</a>.</p>
</div>

View File

@ -24,6 +24,7 @@ Orbit::Application.configure do
# This option may cause significant delays in view rendering with a large
# number of complex assets.
config.assets.debug = true
config.assets.digest = true
config.action_mailer.delivery_method = :smtp
config.action_mailer.smtp_settings = { :address => "localhost", :port => 1025 }
config.action_mailer.default_url_options = { host: "localhost:3000", protocol: "http" }

View File

@ -60,7 +60,8 @@ Orbit::Application.configure do
# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
# config.assets.precompile += %w( search.js )
config.assets.precompile += %w( ckeditor/* )
# config.assets.precompile += %w( ckeditor/* )
config.assets.precompile += %w( *.js *.css *.js.* *.css.* ckeditor/* )
# Ignore bad email addresses and do not raise email delivery errors.
# Set this to true and configure the email server for immediate delivery to raise delivery errors.

View File

@ -22,7 +22,7 @@ module OrbitApp
end
def check_module_permissions
store_token = Site.first.store_token
store_token = Site.first.store_token rescue nil
module_apps = ModuleApp.all
exceptions = OrbitStore::MODULE_EXCEPTIONS
if !store_token.nil?

View File

@ -2,10 +2,10 @@ namespace :register_with_store do
task :register,[:arg] => :environment do |task,args|
modules = ModuleApp.all
ids = modules.collect{|ma| ma.key}
store_token = Site.first.store_token
module_apps = ModuleApp.all
exceptions = OrbitStore::MODULE_EXCEPTIONS
store_token = Site.first.store_token rescue nil
if !store_token.nil?
module_apps = ModuleApp.all
exceptions = OrbitStore::MODULE_EXCEPTIONS
params_to_send = {'store_token' => store_token, "apps" => ids}
uri = URI.parse(OrbitStore::URL)
http = Net::HTTP.new(uri.host,uri.port)