roroacms 0.0.8.6.6 → 0.0.8.6.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/roroacms/admin/admin.js +3 -0
- data/app/assets/stylesheets/roroacms/admin/main.css.scss +9 -1
- data/app/assets/stylesheets/roroacms/vendor/ghostdown.css +4 -0
- data/app/controllers/roroacms/admin/administrators_controller.rb +1 -1
- data/app/controllers/roroacms/admin/dashboard_controller.rb +1 -0
- data/app/controllers/roroacms/application_controller.rb +6 -0
- data/app/views/devise/sessions/new.html.erb +2 -0
- data/app/views/roroacms/admin/dashboard/index.html.erb +18 -6
- data/app/views/roroacms/admin/partials/_content_form.html.erb +12 -3
- data/app/views/roroacms/admin/settings/index.html.erb +1 -1
- data/config/locales/en.yml +5 -3
- data/lib/roroacms/engine.rb +1 -1
- data/lib/roroacms/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c66311108a8b6c47d85059f4fb0b791f560c3b9a
|
4
|
+
data.tar.gz: 74558fe052ba8cbcdaec01ddc724d1ab9f0ac00a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: be1b8a1aadde1e8f609b849c550ccfe47b9c1576f397d924367f38c6e033f4017e20237a40a8dddd21b2b712d75f1ac7d372fc378de4b5b6a80d8285fa3768fc
|
7
|
+
data.tar.gz: b0dd87116cc3f684c36c9f312d1ef40dcf8583d6a542b3210f0914bf993fbe869bdc2def1da4621e7a359cb31e6a298de57ccfbabd386222aced72777d25dea3
|
@@ -2168,8 +2168,16 @@ fieldset[disabled] .btn-warning.active {
|
|
2168
2168
|
color: #8ecf67;
|
2169
2169
|
}
|
2170
2170
|
#login-container .error {
|
2171
|
-
font-size: 12px;
|
2172
2171
|
color: #F74E4D;
|
2172
|
+
display: block;
|
2173
|
+
font-size: 12px;
|
2174
|
+
margin: 0 0 15px;
|
2175
|
+
text-align: center;
|
2176
|
+
padding:7px;
|
2177
|
+
}
|
2178
|
+
|
2179
|
+
a.pop {
|
2180
|
+
color:#5d5f63;
|
2173
2181
|
}
|
2174
2182
|
section#login-container div#error_explanation h2 {
|
2175
2183
|
font-size: 12px;
|
@@ -275,6 +275,10 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
|
|
275
275
|
background: #ffa;
|
276
276
|
background: rgba(255,255,0,0.4)
|
277
277
|
}
|
278
|
+
|
279
|
+
.rendered-markdown hr {
|
280
|
+
border-color:#6c7379 !important;
|
281
|
+
}
|
278
282
|
.CodeMirror span {
|
279
283
|
*vertical-align:text-bottom
|
280
284
|
}
|
@@ -141,6 +141,12 @@ module Roroacms
|
|
141
141
|
|
142
142
|
end
|
143
143
|
|
144
|
+
# Adds an asterix to the field if it is required.
|
145
|
+
|
146
|
+
def mark_required(object, attribute)
|
147
|
+
"*" if object.class.validators_on(attribute).map(&:class).include? ActiveModel::Validations::PresenceValidator
|
148
|
+
end
|
149
|
+
|
144
150
|
|
145
151
|
# protected
|
146
152
|
|
@@ -8,6 +8,8 @@
|
|
8
8
|
<p class="notice"><%= flash[:notice] %></p>
|
9
9
|
<% elsif !flash[:error].blank? %>
|
10
10
|
<p class="error"><%= flash[:error] %></p>
|
11
|
+
<% elsif !flash[:alert].blank? %>
|
12
|
+
<p class="error"><%= flash[:alert] %></p>
|
11
13
|
<% end %>
|
12
14
|
|
13
15
|
<%= form_for(resource, as: resource_name, url: session_path(resource_name), :html => { class: 'form-horizontal' }) do |f| %>
|
@@ -3,8 +3,12 @@
|
|
3
3
|
<div class="col-md-4 col-sm-6">
|
4
4
|
<div class="dashboard-tile detail tile-turquoise">
|
5
5
|
<div class="content">
|
6
|
-
<h1 class="text-left timer"><%=
|
7
|
-
|
6
|
+
<h1 class="text-left timer"><%= @counts[:page] %></h1>
|
7
|
+
<% if @counts[:page] > 1 %>
|
8
|
+
<p><%= t("generic.pages") %></p>
|
9
|
+
<% else %>
|
10
|
+
<p><%= t("generic.page") %></p>
|
11
|
+
<% end %>
|
8
12
|
</div>
|
9
13
|
<div class="icon"><i class="fa fa-files-o"></i>
|
10
14
|
</div>
|
@@ -13,8 +17,12 @@
|
|
13
17
|
<div class="col-md-4 col-sm-6">
|
14
18
|
<div class="dashboard-tile detail tile-turquoise">
|
15
19
|
<div class="content">
|
16
|
-
<h1 class="text-left timer"><%=
|
17
|
-
|
20
|
+
<h1 class="text-left timer"><%= @counts[:post] %></h1>
|
21
|
+
<% if @counts[:post] > 1 %>
|
22
|
+
<p><%= t("generic.articles") %></p>
|
23
|
+
<% else %>
|
24
|
+
<p><%= t("generic.article") %></p>
|
25
|
+
<% end %>
|
18
26
|
</div>
|
19
27
|
<div class="icon"><i class="fa fa-file-text-o"></i>
|
20
28
|
</div>
|
@@ -23,8 +31,12 @@
|
|
23
31
|
<div class="col-md-4 col-sm-6">
|
24
32
|
<div class="dashboard-tile detail tile-turquoise">
|
25
33
|
<div class="content">
|
26
|
-
<h1 class="text-left timer"><%= @comments
|
27
|
-
|
34
|
+
<h1 class="text-left timer"><%= @counts[:comments] %></h1>
|
35
|
+
<% if @counts[:comments] == 1 %>
|
36
|
+
<p><%= t("generic.unseen_comment") %></p>
|
37
|
+
<% else %>
|
38
|
+
<p><%= t("generic.unseen_comments") %></p>
|
39
|
+
<% end %>
|
28
40
|
</div>
|
29
41
|
<div class="icon"><i class="fa fa fa-comments"></i>
|
30
42
|
</div>
|
@@ -93,6 +93,9 @@
|
|
93
93
|
<%= f.label :post_visible, :class => "col-sm-3 control-label" %>
|
94
94
|
<div class="col-sm-6">
|
95
95
|
<%= f.check_box :post_visible, {}, 'N', 'Y' %>
|
96
|
+
<a href="javascript:;" class="pop" data-trigger="hover" data-toggle="popover" data-content="<%= t('views.admin.generic.invisible_url', type: @post_type) %>" data-container="body" data-placement="top">
|
97
|
+
<i class="fa fa-question-circle" ></i>
|
98
|
+
</a>
|
96
99
|
</div>
|
97
100
|
<div class="clearfix"></div>
|
98
101
|
</div>
|
@@ -222,7 +225,9 @@
|
|
222
225
|
<%= f.label :post_seo_is_disabled, :class => "col-sm-3 control-label" %>
|
223
226
|
<div class="col-sm-6">
|
224
227
|
<%= f.check_box :post_seo_is_disabled, {}, 'Y', 'N' %>
|
225
|
-
<
|
228
|
+
<a href="javascript:;" class="pop" data-trigger="hover" data-toggle="popover" data-content="<%= t("views.admin.pages.new.tab_content.seo.seo_disabled_content") %>" data-container="body" data-placement="top">
|
229
|
+
<i class="fa fa-question-circle" ></i>
|
230
|
+
</a>
|
226
231
|
</div>
|
227
232
|
<div class="clearfix"></div>
|
228
233
|
</div>
|
@@ -231,7 +236,9 @@
|
|
231
236
|
<%= f.label :post_seo_no_index, :class => "col-sm-3 control-label" %>
|
232
237
|
<div class="col-sm-6">
|
233
238
|
<%= f.check_box :post_seo_no_index, {}, 'Y', 'N' %>
|
234
|
-
<
|
239
|
+
<a href="javascript:;" class="pop" data-trigger="hover" data-toggle="popover" data-content="<%= t("views.admin.pages.new.tab_content.seo.seo_no_index_content") %>" data-container="body" data-placement="top">
|
240
|
+
<i class="fa fa-question-circle" ></i>
|
241
|
+
</a>
|
235
242
|
</div>
|
236
243
|
<div class="clearfix"></div>
|
237
244
|
</div>
|
@@ -240,7 +247,9 @@
|
|
240
247
|
<%= f.label :post_seo_no_follow, :class => "col-sm-3 control-label" %>
|
241
248
|
<div class="col-sm-6">
|
242
249
|
<%= f.check_box :post_seo_no_follow, {}, 'Y', 'N' %>
|
243
|
-
<
|
250
|
+
<a href="javascript:;" class="pop" data-trigger="hover" data-toggle="popover" data-content="<%= t("views.admin.pages.new.tab_content.seo.seo_no_follow_content") %>" data-container="body" data-placement="top">
|
251
|
+
<i class="fa fa-question-circle" ></i>
|
252
|
+
</a>
|
244
253
|
</div>
|
245
254
|
<div class="clearfix"></div>
|
246
255
|
</div>
|
data/config/locales/en.yml
CHANGED
@@ -5,6 +5,7 @@ en:
|
|
5
5
|
generic:
|
6
6
|
comments: "Comments"
|
7
7
|
unseen_comments: "Unseen Comments"
|
8
|
+
unseen_comment: "Unseen Comment"
|
8
9
|
home: "Home"
|
9
10
|
admin: "Admin"
|
10
11
|
dashboard: "Dashboard"
|
@@ -251,6 +252,7 @@ en:
|
|
251
252
|
truncate: "..."
|
252
253
|
admin:
|
253
254
|
generic:
|
255
|
+
invisible_url: "By checking the tick box it will remove access to the page via the url but still allow you to retrieve the %{type} data through theming methods"
|
254
256
|
save: "Save"
|
255
257
|
save_and_continue: "Save & Continue"
|
256
258
|
save_and_complete: "Save & Complete"
|
@@ -368,9 +370,9 @@ en:
|
|
368
370
|
seo:
|
369
371
|
seo_title_content: "* The contents of this tag are generally shown as the title in search results (and of course in the user's browser)"
|
370
372
|
seo_description_content: "* This tag provides a short description of the page. In some situations this description is used as a part of the snippet shown in the search results"
|
371
|
-
seo_disabled_content: "
|
372
|
-
seo_no_index_content: "
|
373
|
-
seo_no_follow_content: "
|
373
|
+
seo_disabled_content: "If you want to leave meta blank"
|
374
|
+
seo_no_index_content: "Prevents the page from being indexed by search engines"
|
375
|
+
seo_no_follow_content: "Prevents the Googlebot from following links from this page"
|
374
376
|
categories:
|
375
377
|
no_categories: "No categories"
|
376
378
|
no_tags: "No tags"
|
data/lib/roroacms/engine.rb
CHANGED
@@ -62,7 +62,7 @@ module Roroacms
|
|
62
62
|
Rails.application.config.assets.precompile += %w( roroacms/roroacms.js ) if File.exists?("#{Dir.pwd}/app/assets/javascripts/roroacms/roroacms.js")
|
63
63
|
Rails.application.config.assets.precompile += %w( roroacms/roroacms.css ) if File.exists?("#{Dir.pwd}/app/assets/stylesheets/roroacms/roroacms.css")
|
64
64
|
Rails.application.config.assets.precompile += ["theme.css", "theme.js", "theme.scss", "theme.coffee"]
|
65
|
-
Rails.application.config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif *.svg)
|
65
|
+
Rails.application.config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif *.svg, *.ico)
|
66
66
|
|
67
67
|
end
|
68
68
|
|
data/lib/roroacms/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: roroacms
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.8.6.
|
4
|
+
version: 0.0.8.6.7
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Simon Fletcher
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-10-
|
11
|
+
date: 2014-10-04 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|