faalis 2.2.0 → 2.2.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 74e1465f24c5900b4e8484ef993b72d255e8175b
4
- data.tar.gz: 88ee896c91214968e5abaec8719f354dc3e55bfd
3
+ metadata.gz: 792499468ae641db33029e25395d0b74a577acf5
4
+ data.tar.gz: fcce43478c33ec6872330fc489705f79a16f1abc
5
5
  SHA512:
6
- metadata.gz: 73377f0f25c10d502f0ffb6f96a7dcdf3977fb3689708d3c8d1a07c250605a6d8c6fd145d00f7525b8137717057ea477be32c0e4153124d841ae416cee7cb609
7
- data.tar.gz: c192a0dcdf9e82c62c71e83e84446374ea304b16c5b5f8938bc2003cb2fbd3a843563969a930870761e03155d4bdb6f16a844661fc7c72d7c9107bc5ae27ae1a
6
+ metadata.gz: 26b23407f7247395dfba32697f236485d61e6fbac438c28ccf0379479d9206c24f369960320bcb660ba1a017daf75e53786d52888a6d3da5b7ea93c76a3b8b39
7
+ data.tar.gz: e5cdb66dd34cfddc1b4dd43154cd13e04efa57c958caaa800149389c48f1a7cc8a830c7dfdb074aa6053fe09a6a9d2480511a527f2a240bf37ccae9396a14ba2
Binary file
data.tar.gz.sig CHANGED
Binary file
@@ -54,3 +54,21 @@
54
54
  margin-left: 5px;
55
55
  margin-right: 5px;
56
56
  }
57
+
58
+ html {
59
+ min-height: 100% !important;
60
+ position: relative;
61
+ display: block;
62
+ }
63
+ body {
64
+ height: 100% !important;
65
+ }
66
+ .wrapper {
67
+
68
+ height: 100% !important;
69
+ display: block;
70
+ }
71
+
72
+ .content-wrapper {
73
+ height: 100% !important;
74
+ }
@@ -3,9 +3,10 @@ require_dependency 'faalis/dashboard/helpers/box_helpers'
3
3
  module Faalis
4
4
  module DashboardHelper
5
5
  include Faalis::Dashboard::Helpers::BoxHelpers
6
-
6
+ include ::ActionView::Helpers::TranslationHelper
7
7
  def form_label(resource, name)
8
- ::I18n.t("forms.#{@resource.class.name.underscore.to_s.gsub('/', '.')}.#{name}")
8
+ key = "forms.#{@resource.class.name.underscore.to_s.gsub('/', '.')}.#{name}"
9
+ t(key)
9
10
  end
10
11
 
11
12
  def localized_time(time)
@@ -45,7 +45,7 @@
45
45
  <%= yield %>
46
46
  </section><!-- /.content -->
47
47
  </div>
48
- <%= render 'faalis/dashboard/shared/footer' %>
48
+ <%#= render 'faalis/dashboard/shared/footer' %>
49
49
  <%= render 'faalis/dashboard/shared/control_sidebar' %>
50
50
  </div>
51
51
  </body>
@@ -58,7 +58,7 @@ en:
58
58
 
59
59
  permission:
60
60
  permissions: Permissions
61
-
61
+
62
62
  dashboard:
63
63
  users: Users
64
64
  groups: Groups
@@ -68,7 +68,11 @@ en:
68
68
  updated_successfully: "%{resource} updated successfully."
69
69
  removed_successfully: "%{resource} removed successfully."
70
70
  saved_successfully: "%{resource} saved successfully."
71
- user_messages: User Messages
71
+ user_message: User Messages
72
+ user_messages:
73
+ inbox: Inbox
74
+ sent: Sent
75
+ draft: Draft
72
76
 
73
77
  new_resource_title: "New %{resource}"
74
78
  edit_resource_title: "Edit %{resource}"
@@ -14,10 +14,12 @@ fa:
14
14
  faalis:
15
15
  save: 'ذخیره'
16
16
  cancel: 'انصراف'
17
+ back: 'بازگشت'
17
18
  confirm_password: تکرار گذرواژه
18
19
  forgot_your_password: گذرواژه را فراموش کردم
19
20
  didnt_receive_confirmation_instructions: "ایمیل اعتبارسنجی را دریافت نکردم"
20
21
  didnt_receive_unlock_instructions: "ایمیل فعال سازی را دریافت نکردم"
22
+ back: 'بازگشت'
21
23
 
22
24
  faalis_version: نسخه فالیس
23
25
  copyright_html: |
@@ -60,15 +62,15 @@ fa:
60
62
  errors:
61
63
  fix_errors: ابتدا این خطاها را رفع کنید
62
64
  dashboard:
63
- user_messages: 'پیام خصوصی'
64
- user_messages:
65
- inbox: 'صندوق پیام ها'
66
- sent: 'ارسال شده ها'
67
- draft: 'پیش نویس'
68
65
  change_password: 'تغییر گذرواژه'
69
66
  actions: 'عملیات'
70
67
  index_view:
71
68
  new_button: '%{title} جدید'
69
+ user_message: 'پیام خصوصی'
70
+ user_messages:
71
+ inbox: 'صندوق پیام ها'
72
+ sent: 'ارسال شده ها'
73
+ draft: 'پیش نویس'
72
74
  users: کاربران
73
75
  user:
74
76
  first_name: 'نام'
@@ -34,6 +34,10 @@ module Faalis
34
34
  end
35
35
  end
36
36
 
37
+ mattr_accessor :i18n_debug do
38
+ false
39
+ end
40
+
37
41
  # Site Title
38
42
  attr_accessor :site_title do
39
43
  'Faalis'
@@ -34,6 +34,9 @@ module Faalis::Dashboard::DSL
34
34
  @fields = resolve_model_reflections.reject do |field|
35
35
  options[:except].include? field.to_sym
36
36
  end
37
+ elsif options.include? :append
38
+
39
+ @fields += options[:append]
37
40
  else
38
41
 
39
42
  # Check for valid field names
@@ -81,7 +81,6 @@ module Faalis::Dashboard::DSL
81
81
  if respond_to?("setup_#{type}".to_sym, true)
82
82
  return send("setup_#{type}", name)
83
83
  end
84
-
85
84
  { as: type.to_sym }
86
85
  end
87
86
 
@@ -12,6 +12,8 @@ module Faalis::Dashboard::DSL
12
12
  @fields = resolve_model_reflections.reject do |field|
13
13
  options[:except].include? field.to_sym
14
14
  end
15
+ elsif options.include? :append
16
+ @fields += options[:append]
15
17
  else
16
18
  # set new value for fields
17
19
  @fields = fields_name.map(&:to_s) unless fields_name.empty?
@@ -112,9 +112,8 @@ module Faalis::Dashboard::Models
112
112
 
113
113
  end
114
114
 
115
- menu(t('faalis.dashboard.user_messages'),
116
- icon: 'fa fa-envelope-o',
117
- model: 'Faalis::UserMessage') do
115
+ menu(t('faalis.dashboard.user_message'), icon: 'fa fa-envelope-o',
116
+ model: 'Faalis::UserMessage') do
118
117
 
119
118
  item(I18n.t('faalis.dashboard.user_messages.inbox'),
120
119
  model: 'Faalis::UserMessage',
@@ -60,7 +60,8 @@ module ::ActionView
60
60
  raise e if raise_error
61
61
 
62
62
  keys = I18n.normalize_keys(e.locale, e.key, e.options[:scope])
63
- title = "translation missing: #{keys.join('.')}"
63
+ title = keys.last.to_s.humanize
64
+ title = "#{keys.join('.')}" if Faalis::Engine.i18n_debug
64
65
 
65
66
  interpolations = options.except(:default, :scope)
66
67
  if interpolations.any?
@@ -18,5 +18,5 @@
18
18
  # -----------------------------------------------------------------------------
19
19
 
20
20
  module Faalis
21
- VERSION = '2.2.0'
21
+ VERSION = '2.2.1'
22
22
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: faalis
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.0
4
+ version: 2.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sameer Rahmani
@@ -31,7 +31,7 @@ cert_chain:
31
31
  ge9CIZowYamI/vvfSApoebxfKQrV8RTkuhxfkna/XvPQS0Qej6X3vjJ8z5bS5vLo
32
32
  +4LSCtONiaAAc/sP
33
33
  -----END CERTIFICATE-----
34
- date: 2016-08-06 00:00:00.000000000 Z
34
+ date: 2016-11-29 00:00:00.000000000 Z
35
35
  dependencies:
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rails
metadata.gz.sig CHANGED
Binary file