cms-fortress 1.2.0 → 1.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/README.rdoc +1 -1
- data/VERSION +1 -1
- data/app/assets/stylesheets/cms/fortress/themes/wide.css.scss +3 -0
- data/app/controllers/cms/fortress/admin_controller.rb +23 -30
- data/app/controllers/cms/fortress/roles_controller.rb +1 -2
- data/app/helpers/cms/fortress/application_helper.rb +72 -79
- data/app/views/cms/fortress/admin/contents.html.haml +2 -2
- data/app/views/cms/fortress/admin/design.html.haml +2 -2
- data/app/views/cms/fortress/admin/roles.html.haml +1 -1
- data/app/views/cms/fortress/admin/settings.html.haml +2 -2
- data/app/views/cms/fortress/admin/unauthorised.html.haml +1 -1
- data/app/views/cms/fortress/admin/users.html.haml +1 -1
- data/app/views/cms/fortress/roles/_form.html.haml +1 -1
- data/app/views/cms/fortress/roles/edit.html.haml +1 -1
- data/app/views/cms/fortress/roles/index.html.haml +5 -5
- data/app/views/cms/fortress/roles/new.html.haml +1 -1
- data/app/views/cms/fortress/roles/show.html.haml +4 -4
- data/app/views/cms/fortress/shared/_mediaboxes.html.haml +2 -2
- data/app/views/cms/fortress/shared/_menu.html.haml +2 -2
- data/app/views/cms/fortress/shared/_navbar.html.haml +1 -1
- data/app/views/cms/fortress/shared/_page_extend.html.haml +2 -2
- data/app/views/cms/fortress/themes/wide/_body.html.haml +12 -1
- data/app/views/cms/fortress/themes/wide/_menu.html.haml +1 -9
- data/app/views/cms/fortress/users/_form.html.haml +1 -1
- data/app/views/cms/fortress/users/edit.html.haml +1 -1
- data/app/views/cms/fortress/users/index.html.haml +6 -7
- data/app/views/cms/fortress/users/new.html.haml +1 -1
- data/app/views/cms/fortress/users/sessions/new.html.haml +5 -5
- data/cms-fortress.gemspec +3 -2
- data/config/locales/de.yml +63 -0
- data/config/locales/en.yml +39 -2
- data/lib/cms-fortress.rb +5 -5
- metadata +4 -3
data/README.rdoc
CHANGED
@@ -77,7 +77,7 @@ in the left nav bar.
|
|
77
77
|
|
78
78
|
=== Other configuration
|
79
79
|
|
80
|
-
You can turn off page workflow or page caching via configuration
|
80
|
+
You can turn off page workflow or page caching via configuration and you can set the theme to +:wide+ or +:default+:
|
81
81
|
|
82
82
|
Cms::Fortress.configure do |config|
|
83
83
|
config.theme = :wide
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.2.
|
1
|
+
1.2.1
|
@@ -1,36 +1,29 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
def roles
|
6
|
-
@roles = Role.all
|
7
|
-
end
|
8
|
-
|
9
|
-
def images
|
10
|
-
@files = Comfy::Cms::File.images
|
11
|
-
respond_to do |format|
|
12
|
-
format.html { render partial: 'cms/fortress/shared/media_items', locals: {media: @files, type: :image} }
|
13
|
-
format.json { render json: @files }
|
14
|
-
end
|
15
|
-
end
|
16
|
-
|
17
|
-
def videos
|
18
|
-
@files = Comfy::Cms::File.videos
|
19
|
-
respond_to do |format|
|
20
|
-
format.html { render partial: 'cms/fortress/shared/media_items', locals: {media: @files, type: :video} }
|
21
|
-
format.json { render json: @files }
|
22
|
-
end
|
23
|
-
end
|
1
|
+
class Cms::Fortress::AdminController < Comfy::Admin::Cms::BaseController
|
2
|
+
def roles
|
3
|
+
@roles = Role.all
|
4
|
+
end
|
24
5
|
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
6
|
+
def images
|
7
|
+
@files = Comfy::Cms::File.images
|
8
|
+
respond_to do |format|
|
9
|
+
format.html { render partial: 'cms/fortress/shared/media_items', locals: {media: @files, type: :image} }
|
10
|
+
format.json { render json: @files }
|
11
|
+
end
|
12
|
+
end
|
32
13
|
|
14
|
+
def videos
|
15
|
+
@files = Comfy::Cms::File.videos
|
16
|
+
respond_to do |format|
|
17
|
+
format.html { render partial: 'cms/fortress/shared/media_items', locals: {media: @files, type: :video} }
|
18
|
+
format.json { render json: @files }
|
19
|
+
end
|
20
|
+
end
|
33
21
|
|
22
|
+
def other_files
|
23
|
+
@files = Comfy::Cms::File.others.map {|f| {title: f.label, value: f.file.url}}
|
24
|
+
respond_to do |format|
|
25
|
+
format.html { render partial: 'cms/fortress/shared/media_items', locals: {media: @files, type: :others} }
|
26
|
+
format.json { render json: @files }
|
34
27
|
end
|
35
28
|
end
|
36
29
|
end
|
@@ -3,7 +3,6 @@ class Cms::Fortress::RolesController < Comfy::Admin::Cms::BaseController
|
|
3
3
|
authorize! :manage, Cms::Fortress::Role
|
4
4
|
end
|
5
5
|
|
6
|
-
|
7
6
|
# GET /cms/fortress/roles
|
8
7
|
# GET /cms/fortress/roles.json
|
9
8
|
def index
|
@@ -29,7 +28,7 @@ class Cms::Fortress::RolesController < Comfy::Admin::Cms::BaseController
|
|
29
28
|
def refresh
|
30
29
|
@cms_fortress_role = Cms::Fortress::Role.find(params[:id])
|
31
30
|
@cms_fortress_role.load_defaults
|
32
|
-
|
31
|
+
|
33
32
|
respond_to do |format|
|
34
33
|
if @cms_fortress_role.save
|
35
34
|
format.html { redirect_to @cms_fortress_role }
|
@@ -1,96 +1,89 @@
|
|
1
|
-
module Cms
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
def role_display(command)
|
7
|
-
res = command.split(".")
|
8
|
-
raw "#{content_tag(:strong, res.first.titleize) } / #{ res[1..-1].map {|r| r.titleize}.join(" - ") }"
|
9
|
-
end
|
10
|
-
|
11
|
-
def theme_name
|
12
|
-
Cms::Fortress.configuration.theme.to_s
|
13
|
-
end
|
1
|
+
module Cms::Fortress::ApplicationHelper
|
2
|
+
def role_display(command)
|
3
|
+
res = command.split(".")
|
4
|
+
raw "#{content_tag(:strong, res.first.titleize) } / #{ res[1..-1].map {|r| r.titleize}.join(" - ") }"
|
5
|
+
end
|
14
6
|
|
15
|
-
|
16
|
-
|
17
|
-
|
7
|
+
def theme_name
|
8
|
+
Cms::Fortress.configuration.theme.to_s
|
9
|
+
end
|
18
10
|
|
19
|
-
|
20
|
-
|
21
|
-
|
11
|
+
def default_theme?
|
12
|
+
theme_name.to_s.eql?('default')
|
13
|
+
end
|
22
14
|
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
comfy_admin_cms_site_pages_path
|
27
|
-
when "files"
|
28
|
-
comfy_admin_cms_site_files_path
|
29
|
-
when "layouts"
|
30
|
-
comfy_admin_cms_site_layouts_path
|
31
|
-
when "snippets"
|
32
|
-
comfy_admin_cms_site_snippets_path
|
33
|
-
else
|
34
|
-
""
|
35
|
-
end
|
36
|
-
end
|
15
|
+
def themed_partial(partial)
|
16
|
+
render partial: "cms/fortress/themes/#{ theme_name }/#{ partial }"
|
17
|
+
end
|
37
18
|
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
19
|
+
def back_path
|
20
|
+
case controller_name
|
21
|
+
when "pages"
|
22
|
+
comfy_admin_cms_site_pages_path
|
23
|
+
when "files"
|
24
|
+
comfy_admin_cms_site_files_path
|
25
|
+
when "layouts"
|
26
|
+
comfy_admin_cms_site_layouts_path
|
27
|
+
when "snippets"
|
28
|
+
comfy_admin_cms_site_snippets_path
|
29
|
+
else
|
30
|
+
""
|
31
|
+
end
|
32
|
+
end
|
49
33
|
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
34
|
+
def media_files_path(type)
|
35
|
+
if params[:site_id]
|
36
|
+
if type.eql?(:image)
|
37
|
+
cms_fortress_files_images_path
|
38
|
+
elsif type.eql?(:video)
|
39
|
+
cms_fortress_files_videos_path
|
40
|
+
else
|
41
|
+
cms_fortress_files_others_url(format: :json)
|
54
42
|
end
|
43
|
+
end
|
44
|
+
end
|
55
45
|
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
raw links.join(" ")
|
62
|
-
end
|
46
|
+
def image_item(m)
|
47
|
+
styles = {original: m.file.url}
|
48
|
+
m.file.styles.keys.each {|k,v| styles[k] = m.file.url(k) }
|
49
|
+
link_to image_tag(m.file.url(:cms_thumb), alt: m.label, class: 'editor-image', data: styles), "#"
|
50
|
+
end
|
63
51
|
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
52
|
+
def image_styles(m)
|
53
|
+
links = []
|
54
|
+
links << link_to("Original", m.file.url, class: 'label label-primary editor-image-style', target: '_blank', title: "Select original size")
|
55
|
+
i = 0
|
56
|
+
m.file.styles.each {|k,v| links << link_to("#{ i+=1 }", m.file.url(k), class: 'label label-primary editor-image-style', target: '_blank', title: "Select #{ k.to_s.titleize }") }
|
57
|
+
raw links.join(" ")
|
58
|
+
end
|
68
59
|
|
69
|
-
|
70
|
-
|
71
|
-
|
60
|
+
def topnav_item(title, path, is_current = false)
|
61
|
+
css_class = is_current ? "active" : ""
|
62
|
+
content_tag(:li, link_to(title, path), class: css_class)
|
63
|
+
end
|
72
64
|
|
65
|
+
def leftnav_item(title, path, options = {})
|
66
|
+
content_tag(:li, active_link_to(title, path, options))
|
67
|
+
end
|
73
68
|
|
74
|
-
def admin_page?
|
75
|
-
controller_name.eql?('admin') && %w{roles users}.include?(action_name) ||
|
76
|
-
Cms::Fortress.configuration.settings_resources.
|
77
|
-
map { |resource| resource[:name] }.
|
78
|
-
include?(controller_name)
|
79
|
-
end
|
80
69
|
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
70
|
+
def admin_page?
|
71
|
+
controller_name.eql?('admin') && %w{roles users}.include?(action_name) ||
|
72
|
+
Cms::Fortress.configuration.settings_resources.
|
73
|
+
map { |resource| resource[:name] }.
|
74
|
+
include?(controller_name)
|
75
|
+
end
|
86
76
|
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
77
|
+
def design_page?
|
78
|
+
Cms::Fortress.configuration.design_resources.
|
79
|
+
map { |resource| resource[:name] }.
|
80
|
+
include?(controller_name)
|
81
|
+
end
|
92
82
|
|
93
|
-
|
83
|
+
def content_page?
|
84
|
+
Cms::Fortress.configuration.content_resources.
|
85
|
+
map { |resource| resource[:name] }.
|
86
|
+
include?(controller_name)
|
94
87
|
end
|
95
88
|
end
|
96
89
|
|
@@ -1 +1 @@
|
|
1
|
-
%h2
|
1
|
+
%h2= t('cms.fortress.admin.roles')
|
@@ -1,2 +1,2 @@
|
|
1
1
|
.alert.alert-danger
|
2
|
-
%h3
|
2
|
+
%h3= t('cms.fortress.admin.not_authorized')
|
@@ -1 +1 @@
|
|
1
|
-
%h2
|
1
|
+
%h2= t('cms.fortress.admin.users')
|
@@ -2,5 +2,5 @@
|
|
2
2
|
= form.text_area :description, :rows => 2
|
3
3
|
|
4
4
|
= form.form_group :class => 'form-actions' do
|
5
|
-
= form.submit @cms_fortress_role.new_record? ? '
|
5
|
+
= form.submit @cms_fortress_role.new_record? ? t('cms.fortress.create') : t('cms.fortress.update'), :class => 'btn btn-primary'
|
6
6
|
|
@@ -4,8 +4,8 @@
|
|
4
4
|
|
5
5
|
%table.table.table-hover.table-bordered.table-striped
|
6
6
|
%tr
|
7
|
-
%th
|
8
|
-
%th{:style => 'width: 60%;'}
|
7
|
+
%th= t('cms.fortress.roles.name')
|
8
|
+
%th{:style => 'width: 60%;'}= t('cms.fortress.roles.description')
|
9
9
|
%th
|
10
10
|
|
11
11
|
- @cms_fortress_roles.each do |cms_fortress_role|
|
@@ -14,7 +14,7 @@
|
|
14
14
|
%td= cms_fortress_role.description
|
15
15
|
%td
|
16
16
|
.btn-group.pull-right
|
17
|
-
= link_to '
|
18
|
-
= link_to '
|
19
|
-
= link_to '
|
17
|
+
= link_to t('cms.fortress.roles.show_access_rights'), cms_fortress_role, :class => 'btn btn-sm btn-info'
|
18
|
+
= link_to t('cms.fortress.edit'), edit_cms_fortress_role_path(cms_fortress_role), :class => 'btn btn-sm btn-default'
|
19
|
+
= link_to t('cms.fortress.delete'), cms_fortress_role, :method => :delete, :data => { :confirm => 'Are you sure?' }, :class => 'btn btn-sm btn-danger'
|
20
20
|
|
@@ -3,7 +3,7 @@
|
|
3
3
|
=# link_to t('.edit'), edit_cms_fortress_role_path(@cms_fortress_role), :class => 'btn'
|
4
4
|
= link_to t('cms.fortress.roles.load'), refresh_cms_fortress_role_path(@cms_fortress_role), :class => 'btn btn-primary', :method => :post
|
5
5
|
= link_to t('cms.fortress.roles.back'), cms_fortress_roles_path, :class => 'btn btn-default'
|
6
|
-
%h3= "
|
6
|
+
%h3= "#{t('cms.fortress.roles.role')}: #{ @cms_fortress_role.name }"
|
7
7
|
%p= @cms_fortress_role.description
|
8
8
|
|
9
9
|
|
@@ -12,8 +12,8 @@
|
|
12
12
|
%table.table
|
13
13
|
%tr
|
14
14
|
%th
|
15
|
-
%th
|
16
|
-
%th
|
15
|
+
%th= t('cms.fortress.roles.show')
|
16
|
+
%th= t('cms.fortress.roles.manage')
|
17
17
|
= f.fields_for :role_details do |role|
|
18
18
|
%tr
|
19
19
|
%td= role_display(role.object.command)
|
@@ -21,5 +21,5 @@
|
|
21
21
|
%td= role.check_box :can_create
|
22
22
|
|
23
23
|
.form-actions
|
24
|
-
= f.submit '
|
24
|
+
= f.submit t('cms.fortress.roles.save'), :class => 'btn btn-primary'
|
25
25
|
|
@@ -3,13 +3,13 @@
|
|
3
3
|
.modal-content
|
4
4
|
.modal-header
|
5
5
|
%button(type="button" class="close" data-dismiss="modal" aria-hidden="true") x
|
6
|
-
%h5.title
|
6
|
+
%h5.title= t('cms.fortress.image_selector')
|
7
7
|
#modal-body.modal-body
|
8
8
|
=# render partial: 'cms/fortress/shared/media_items', locals: {media: media}
|
9
9
|
|
10
10
|
.modal-footer
|
11
11
|
%small.muted
|
12
|
-
|
12
|
+
= t('cms.fortress.insert_item')
|
13
13
|
|
14
14
|
:coffeescript
|
15
15
|
CmsFortress.media.imagesPath = "#{ media_files_path(:image) }"
|
@@ -2,7 +2,7 @@
|
|
2
2
|
.container-fluid
|
3
3
|
.navbar-header
|
4
4
|
%button.navbar-toggle(type="button" data-toggle="collapse" data-target="#main-nav")
|
5
|
-
%span.sr-only
|
5
|
+
%span.sr-only= t('cms.fortress.toggle_navigation')
|
6
6
|
%span.icon-bar
|
7
7
|
%span.icon-bar
|
8
8
|
%span.icon-bar
|
@@ -37,7 +37,7 @@
|
|
37
37
|
%span.caret
|
38
38
|
%ul.dropdown-menu(role="menu")
|
39
39
|
%li
|
40
|
-
= link_to
|
40
|
+
= link_to t('cms.fortress.logout'), destroy_cms_fortress_user_session_path, :method => 'delete'
|
41
41
|
|
42
42
|
|
43
43
|
|
@@ -1,7 +1,7 @@
|
|
1
1
|
- if Cms::Fortress.configuration.enable_page_workflow
|
2
2
|
= form.fields_for :page_workflow, control_col: "col-sm-4" do |wf|
|
3
3
|
= wf.select :status_id, Cms::PageWorkflow.statuses_for_select(can?(:manage, 'contents.page.publish'), can?(:manage, 'contents.page.review')), {}, {class: "status-control"}
|
4
|
-
= wf.text_field :published_date, label: '
|
4
|
+
= wf.text_field :published_date, label: t('cms.fortress.published'), class: "status-control", :data => {:utc_date => (@page.page_workflow.published_date.nil? ? Time.now : @page.page_workflow.published_date).strftime("%d %B, %Y") }
|
5
5
|
|
6
6
|
- if Cms::Fortress.configuration.enable_page_caching
|
7
|
-
= form.select :cached_timeout, Cms::PageWorkflow.cached_timeout_for_select, {label: '
|
7
|
+
= form.select :cached_timeout, Cms::PageWorkflow.cached_timeout_for_select, {label: t('cms.fortress.cached_timeout'), control_col: "col-sm-4"}, {class: 'status-control'}
|
@@ -1,5 +1,16 @@
|
|
1
1
|
.container.wide-body
|
2
|
-
|
2
|
+
- if controller_name.eql?('revisions')
|
3
|
+
.row
|
4
|
+
.col-sm-9
|
5
|
+
= render :partial => 'layouts/comfy/admin/cms/center'
|
6
|
+
.col-sm-3
|
7
|
+
.panel.panel-default.revision-list
|
8
|
+
.panel-heading
|
9
|
+
Revisions
|
10
|
+
.panel-body
|
11
|
+
= yield :right_column
|
12
|
+
- else
|
13
|
+
= render :partial => 'layouts/comfy/admin/cms/center'
|
3
14
|
|
4
15
|
= render :partial => 'layouts/comfy/admin/cms/footer'
|
5
16
|
|
@@ -1,6 +1,5 @@
|
|
1
1
|
- if @site && !@site.new_record?
|
2
2
|
- if Cms::Fortress.configuration.content_resources.any? {|resource| can? :view, "contents.#{resource[:name]}" }
|
3
|
-
|
4
3
|
%li.dropdown(class="#{ "active" if content_page? }")
|
5
4
|
%a.dropdown-toggle(data-toggle='dropdown' href='#')
|
6
5
|
= t("cms.fortress.contents")
|
@@ -13,9 +12,7 @@
|
|
13
12
|
- if path
|
14
13
|
= topnav_item t(resource[:title]), path, current_page?(path)
|
15
14
|
|
16
|
-
|
17
15
|
- if Cms::Fortress.configuration.design_resources.any? {|resource| can? :view, "designs.#{resource[:name]}" }
|
18
|
-
|
19
16
|
%li.dropdown(class="#{ "active" if design_page? }")
|
20
17
|
%a.dropdown-toggle(data-toggle='dropdown' href='#')
|
21
18
|
= t("cms.fortress.design")
|
@@ -27,12 +24,10 @@
|
|
27
24
|
- if path
|
28
25
|
= topnav_item t(resource[:title]), path, current_page?(path)
|
29
26
|
|
30
|
-
|
31
|
-
|
32
27
|
- if Cms::Fortress.configuration.settings_resources.any? {|resource| can? :view, "settings.#{resource[:name]}" }
|
33
28
|
%li.dropdown(class="#{ "active" if admin_page? }")
|
34
29
|
%a.dropdown-toggle(data-toggle='dropdown' href='#')
|
35
|
-
= t("cms.fortress.
|
30
|
+
= t("cms.fortress.settings")
|
36
31
|
%b.caret
|
37
32
|
%ul.dropdown-menu
|
38
33
|
- Cms::Fortress.configuration.settings_resources.each do |resource|
|
@@ -40,6 +35,3 @@
|
|
40
35
|
- path = begin; eval(resource[:path]); rescue; end
|
41
36
|
- if path
|
42
37
|
= topnav_item t(resource[:title]), path, current_page?(path)
|
43
|
-
|
44
|
-
|
45
|
-
|
@@ -6,5 +6,5 @@
|
|
6
6
|
= form.password_field :password_confirmation
|
7
7
|
|
8
8
|
= form.form_group :class => 'form-actions' do
|
9
|
-
= form.submit @cms_fortress_user.new_record? ? '
|
9
|
+
= form.submit @cms_fortress_user.new_record? ? t('cms.fortress.create') : t('cms.fortress.update'), :class => 'btn btn-primary'
|
10
10
|
|
@@ -6,13 +6,12 @@
|
|
6
6
|
|
7
7
|
%table.table.table-hover.table-bordered
|
8
8
|
%tr
|
9
|
-
%th
|
10
|
-
%th
|
11
|
-
%th
|
12
|
-
%th
|
9
|
+
%th= t('cms.fortress.users.last_name')
|
10
|
+
%th= t('cms.fortress.users.first_name')
|
11
|
+
%th= t('cms.fortress.users.email')
|
12
|
+
%th= t('cms.fortress.users.role')
|
13
13
|
%th
|
14
14
|
|
15
|
-
|
16
15
|
- @cms_fortress_users.each do |cms_fortress_user|
|
17
16
|
%tr
|
18
17
|
%td= cms_fortress_user.last_name
|
@@ -21,6 +20,6 @@
|
|
21
20
|
%td= cms_fortress_user.role.name
|
22
21
|
%td
|
23
22
|
.btn-group.pull-right
|
24
|
-
= link_to '
|
25
|
-
= link_to '
|
23
|
+
= link_to t('cms.fortress.edit'), edit_cms_fortress_user_path(cms_fortress_user), :class => 'btn btn-sm btn-default'
|
24
|
+
= link_to t('cms.fortress.delete'), cms_fortress_user, method: :delete, data: { confirm: t('cms.fortress.are_you_sure') }, :class => 'btn btn-sm btn-danger'
|
26
25
|
|
@@ -1,15 +1,15 @@
|
|
1
1
|
= render :partial => 'cms/fortress/shared/navbar'
|
2
2
|
= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => {:role => "form", :class => "form-signin" }) do |f|
|
3
|
-
%h3.form-signin-heading
|
3
|
+
%h3.form-signin-heading= t('cms.fortress.users.sessions.new.sign_in')
|
4
4
|
.form-group
|
5
|
-
= f.email_field :email, :autofocus => true, :placeholder =>
|
5
|
+
= f.email_field :email, :autofocus => true, :placeholder => t('cms.fortress.users.sessions.new.email_address'), :class => "form-control"
|
6
6
|
.form-group
|
7
|
-
= f.password_field :password, :placeholder =>
|
7
|
+
= f.password_field :password, :placeholder => t('cms.fortress.users.sessions.new.password'), :class => "form-control"
|
8
8
|
|
9
9
|
- if devise_mapping.rememberable?
|
10
10
|
.checkbox
|
11
11
|
%label.checkbox
|
12
12
|
= f.check_box :remember_me
|
13
|
-
|
14
|
-
= f.submit
|
13
|
+
= t('cms.fortress.users.sessions.new.remember_me')
|
14
|
+
= f.submit t('cms.fortress.users.sessions.new.sign_in'), :class => "btn btn-primary btn-md"
|
15
15
|
= render "devise/shared/links"
|
data/cms-fortress.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = "cms-fortress"
|
8
|
-
s.version = "1.2.
|
8
|
+
s.version = "1.2.1"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Melvin Sembrano"]
|
12
|
-
s.date = "2014-05-
|
12
|
+
s.date = "2014-05-25"
|
13
13
|
s.description = "Comfortable Mexican Sofa (CMS) - User and role management extension"
|
14
14
|
s.email = "melvinsembrano@gmail.com"
|
15
15
|
s.extra_rdoc_files = [
|
@@ -82,6 +82,7 @@ Gem::Specification.new do |s|
|
|
82
82
|
"app/views/layouts/comfy/admin/cms/_left.html.haml",
|
83
83
|
"cms-fortress.gemspec",
|
84
84
|
"config/initializers/cms_fortress.rb",
|
85
|
+
"config/locales/de.yml",
|
85
86
|
"config/locales/en.yml",
|
86
87
|
"config/roles.yml",
|
87
88
|
"db/migrate/01_devise_create_cms_fortress_users.rb",
|
@@ -0,0 +1,63 @@
|
|
1
|
+
de:
|
2
|
+
cms:
|
3
|
+
fortress:
|
4
|
+
page_title: CMS Fortress Admin
|
5
|
+
title: CMS Fortress
|
6
|
+
contents: Inhalte
|
7
|
+
design: Design
|
8
|
+
admin: Admin
|
9
|
+
login: Logout
|
10
|
+
logout: Logout
|
11
|
+
create: Erstellen
|
12
|
+
update: Aktualisieren
|
13
|
+
delete: Löschen
|
14
|
+
edit: Bearbeiten
|
15
|
+
are_you_sure: Sind Sie sicher?
|
16
|
+
cancel: Abbrechen
|
17
|
+
published: Publiziert
|
18
|
+
cached_timeout: Cached Timeout
|
19
|
+
toggle_navigation: Navigation einklappen
|
20
|
+
image_selector: Bildauswahl
|
21
|
+
insert_item: Ein Bild anklicken um es in den ausgewählten Editor einzufügen.
|
22
|
+
settings: Einstellungen
|
23
|
+
|
24
|
+
admin:
|
25
|
+
users: Benutzer
|
26
|
+
not_authorized: Sie sind nicht berechtigt diese Funktionalität zu nutzen
|
27
|
+
settings_dashboard: Dashboard für Einstellungen
|
28
|
+
roles: Rollen
|
29
|
+
design_dashboard: Dashboard für Designs
|
30
|
+
design_related_information: Diese Seite wird Design spezifische Einstellungen zeigen.
|
31
|
+
content_dashboard: Dashboard für Inhalte
|
32
|
+
content_related_information: "Diese Seite wird Inhalt spezifische Einstellungen zeigen (Historie, Graphen, Analytics und andere.)"
|
33
|
+
|
34
|
+
roles:
|
35
|
+
title: Rollen
|
36
|
+
new_link: Neue Rolle
|
37
|
+
edit_title: Rolle bearbeiten
|
38
|
+
new_title: Neue Rolle erstellen
|
39
|
+
back: Zurück
|
40
|
+
load: Neue Rollen laden
|
41
|
+
role: Rolle
|
42
|
+
show: Anzeigen
|
43
|
+
manage: Verwalten
|
44
|
+
save: Speichern
|
45
|
+
description: Beschreibung
|
46
|
+
show_access_rights: Zugriffsrechte anzeigen
|
47
|
+
name: Name
|
48
|
+
|
49
|
+
users:
|
50
|
+
title: Benutzer
|
51
|
+
new_link: Neuer Benutzer
|
52
|
+
edit_title: Benutzer bearbeiten
|
53
|
+
new_title: Neuen benutzer erstellen
|
54
|
+
last_name: Nachname
|
55
|
+
first_name: Vorname
|
56
|
+
email: E-Mail
|
57
|
+
role: Rolle
|
58
|
+
sessions:
|
59
|
+
new:
|
60
|
+
sign_in: Anmelden
|
61
|
+
email_address: E-Mail Adresse
|
62
|
+
password: Password
|
63
|
+
remember_me: Angemeldet bleiben
|
data/config/locales/en.yml
CHANGED
@@ -8,6 +8,28 @@ en:
|
|
8
8
|
admin: Admin
|
9
9
|
login: Logout
|
10
10
|
logout: Logout
|
11
|
+
create: Create
|
12
|
+
update: Update
|
13
|
+
delete: Delete
|
14
|
+
edit: Edit
|
15
|
+
are_you_sure: Are you sure?
|
16
|
+
cancel: Cancel
|
17
|
+
published: Published
|
18
|
+
cached_timeout: Cached Timeout
|
19
|
+
toggle_navigation: Toggle Navigation
|
20
|
+
image_selector: Image Selector
|
21
|
+
insert_item: Click the thumbnail to insert item to the selected editor.
|
22
|
+
settings: Settings
|
23
|
+
|
24
|
+
admin:
|
25
|
+
users: Users
|
26
|
+
not_authorized: You are not authorized to access this functionality
|
27
|
+
settings_dashboard: Settings Dashboard
|
28
|
+
roles: Roles
|
29
|
+
design_dashboard: Design Dashboard
|
30
|
+
design_related_information: This page will show design related information.
|
31
|
+
content_dashboard: Content Dashboard
|
32
|
+
content_related_information: "This page will show contents related information (history, graphs, analytics and etc.)"
|
11
33
|
|
12
34
|
roles:
|
13
35
|
title: Roles
|
@@ -16,11 +38,26 @@ en:
|
|
16
38
|
new_title: Create New Role
|
17
39
|
back: Back
|
18
40
|
load: Load New Roles
|
41
|
+
role: Role
|
42
|
+
show: Show
|
43
|
+
manage: Manage
|
44
|
+
save: Save
|
45
|
+
description: Description
|
46
|
+
show_access_rights: Show Access Rights
|
47
|
+
name: Name
|
19
48
|
|
20
49
|
users:
|
21
50
|
title: Users
|
22
51
|
new_link: New User
|
23
52
|
edit_title: Edit User
|
24
53
|
new_title: Create New User
|
25
|
-
|
26
|
-
|
54
|
+
last_name: Lastname
|
55
|
+
first_name: Firstname
|
56
|
+
email: Email
|
57
|
+
role: Role
|
58
|
+
sessions:
|
59
|
+
new:
|
60
|
+
sign_in: Sign In
|
61
|
+
email_address: Email Address
|
62
|
+
password: Password
|
63
|
+
remember_me: Remember me
|
data/lib/cms-fortress.rb
CHANGED
@@ -33,20 +33,20 @@ module Cms
|
|
33
33
|
@enable_page_workflow = true
|
34
34
|
@enable_page_caching = true
|
35
35
|
@content_resources = [
|
36
|
-
{:name => 'pages', :title => 'admin.cms.base.pages',
|
36
|
+
{:name => 'pages', :title => 'comfy.admin.cms.base.pages',
|
37
37
|
:path => 'comfy_admin_cms_site_pages_path(@site) if @site && !@site.new_record?'},
|
38
|
-
{:name => 'files', :title => 'admin.cms.base.files',
|
38
|
+
{:name => 'files', :title => 'comfy.admin.cms.base.files',
|
39
39
|
:path => 'comfy_admin_cms_site_files_path(@site) if @site && !@site.new_record?'}
|
40
40
|
]
|
41
41
|
@design_resources = [
|
42
|
-
{:name => 'layouts', :title => 'admin.cms.base.layouts',
|
42
|
+
{:name => 'layouts', :title => 'comfy.admin.cms.base.layouts',
|
43
43
|
:path => 'comfy_admin_cms_site_layouts_path(@site) if @site && !@site.new_record?'
|
44
44
|
},
|
45
|
-
{:name => 'snippets', :title => 'admin.cms.base.snippets',
|
45
|
+
{:name => 'snippets', :title => 'comfy.admin.cms.base.snippets',
|
46
46
|
:path => 'comfy_admin_cms_site_snippets_path(@site) if @site && !@site.new_record?'}
|
47
47
|
]
|
48
48
|
@settings_resources = [
|
49
|
-
{:name => 'sites', :title => 'admin.cms.base.sites',
|
49
|
+
{:name => 'sites', :title => 'comfy.admin.cms.base.sites',
|
50
50
|
:path => 'comfy_admin_cms_sites_path'},
|
51
51
|
{:name => 'roles', :title => 'cms.fortress.roles.title',
|
52
52
|
:path => 'cms_fortress_roles_path'},
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cms-fortress
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.2.
|
4
|
+
version: 1.2.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2014-05-
|
12
|
+
date: 2014-05-25 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rails
|
@@ -244,6 +244,7 @@ files:
|
|
244
244
|
- app/views/layouts/comfy/admin/cms/_left.html.haml
|
245
245
|
- cms-fortress.gemspec
|
246
246
|
- config/initializers/cms_fortress.rb
|
247
|
+
- config/locales/de.yml
|
247
248
|
- config/locales/en.yml
|
248
249
|
- config/roles.yml
|
249
250
|
- db/migrate/01_devise_create_cms_fortress_users.rb
|
@@ -300,7 +301,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
300
301
|
version: '0'
|
301
302
|
segments:
|
302
303
|
- 0
|
303
|
-
hash:
|
304
|
+
hash: 4381613348191105399
|
304
305
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
305
306
|
none: false
|
306
307
|
requirements:
|