tenon 1.0.48 → 1.0.49
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/stylesheets/tenon/mixins.css.scss +2 -12
- data/app/assets/stylesheets/tenon/ui/login.css.scss +6 -0
- data/app/helpers/tenon/tenon_helper.rb +0 -11
- data/app/models/tenon/asset.rb +1 -2
- data/app/models/tenon/user.rb +8 -2
- data/app/views/tenon/assets/_sidebar_index.html.haml +0 -3
- data/lib/tenon/version.rb +1 -1
- data/spec/models/tenon/asset_spec.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: 619780ee5084625b9e5fdb2c3fce7dbbfb582a5a
|
4
|
+
data.tar.gz: 30c4d7fcba7d142b1d534c561b3de368b87f4e1d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: cf68bb7c4e5b4ae5b8977e47ed9135cccf45a6431205224c937199f426974b8b4619cac70ebbc372fbc66d3cb0bb0ff12c0ae7f21c678c18950d4731c2c9769f
|
7
|
+
data.tar.gz: c52fd8a04e4ea4a51c5bdde748edef569e30047401d7d3348cb5c550915352037182d369a8deed06e82eed10c17922bbd95fa5f65a96dd3ef4e87feb8f8d231e
|
@@ -2,6 +2,8 @@
|
|
2
2
|
position: absolute;
|
3
3
|
z-index: 5;
|
4
4
|
opacity: 0;
|
5
|
+
width: 100%;
|
6
|
+
cursor: pointer;
|
5
7
|
|
6
8
|
& + label {
|
7
9
|
display: inline;
|
@@ -26,15 +28,6 @@
|
|
26
28
|
content: $checked;
|
27
29
|
}
|
28
30
|
|
29
|
-
// &:hover + label:before {
|
30
|
-
|
31
|
-
// @if $hover-color != inherit {
|
32
|
-
// color: $hover-color;
|
33
|
-
// }
|
34
|
-
// content: $hover;
|
35
|
-
// outline: 2px auto $checked-color;
|
36
|
-
// }
|
37
|
-
|
38
31
|
&:focus + label:before {
|
39
32
|
outline: 1px dotted $checked-color;
|
40
33
|
content: $active;
|
@@ -70,8 +63,5 @@
|
|
70
63
|
&:nth-child(#{$number-of-columns}n + #{$number-of-columns}) {
|
71
64
|
margin-right: 0;
|
72
65
|
}
|
73
|
-
// &:nth-child(#{2 * $number-of-columns}n + 1):last-child, &:nth-child(#{2 * $number-of-columns}n + 2):last-child {
|
74
|
-
// @include span-columns(12);
|
75
|
-
// }
|
76
66
|
}
|
77
67
|
|
@@ -61,17 +61,6 @@ module Tenon
|
|
61
61
|
end
|
62
62
|
end
|
63
63
|
|
64
|
-
# form row helper for boolean published block
|
65
|
-
def publish_box(f, object)
|
66
|
-
if can?(:publish, object)
|
67
|
-
content = [
|
68
|
-
f.check_box(:published, class: 'tn-checkbox-right'),
|
69
|
-
f.super_label(:published, 'Published?')
|
70
|
-
].join(' ').html_safe
|
71
|
-
content_tag(:div, content, class: 'form-group inline')
|
72
|
-
end
|
73
|
-
end
|
74
|
-
|
75
64
|
def i18n_language_nav(table)
|
76
65
|
if Tenon.config.languages && I18nLookup.fields[:tables][table]
|
77
66
|
render 'tenon/shared/i18n_language_nav'
|
data/app/models/tenon/asset.rb
CHANGED
@@ -23,7 +23,7 @@ module Tenon
|
|
23
23
|
before_destroy :check_attached_items
|
24
24
|
|
25
25
|
def self.with_type(type)
|
26
|
-
if %w(images
|
26
|
+
if %w(images).include?(type)
|
27
27
|
where('attachment_content_type LIKE ?', "%#{type.singularize}%")
|
28
28
|
else
|
29
29
|
documents
|
@@ -32,7 +32,6 @@ module Tenon
|
|
32
32
|
|
33
33
|
def self.documents
|
34
34
|
where('attachment_content_type NOT LIKE ?', '%image%')
|
35
|
-
.where('attachment_content_type NOT LIKE ?', '%video%')
|
36
35
|
end
|
37
36
|
|
38
37
|
def is_image?
|
data/app/models/tenon/user.rb
CHANGED
@@ -1,8 +1,14 @@
|
|
1
1
|
module Tenon
|
2
2
|
class User < ActiveRecord::Base
|
3
3
|
# Include default devise modules. Others available are:
|
4
|
-
# :token_authenticatable, :confirmable, :lockable and
|
5
|
-
devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable
|
4
|
+
# :token_authenticatable, :confirmable, :lockable and
|
5
|
+
devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable, :timeoutable
|
6
|
+
|
7
|
+
# To use :timeoutable, extent the Tenon::User model and
|
8
|
+
# include the following method your preferred value:
|
9
|
+
# def timeout_in
|
10
|
+
# 30.days
|
11
|
+
# end
|
6
12
|
|
7
13
|
# Roles
|
8
14
|
has_many :role_assignments
|
data/lib/tenon/version.rb
CHANGED
@@ -2,7 +2,7 @@ require 'spec_helper'
|
|
2
2
|
|
3
3
|
describe Tenon::Asset do
|
4
4
|
describe '.with_type' do
|
5
|
-
%w(images
|
5
|
+
%w(images).each do |type|
|
6
6
|
context "when type is #{type}" do
|
7
7
|
it 'should receive the proper args' do
|
8
8
|
args = ['attachment_content_type LIKE ?', "%#{type.singularize}%"]
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: tenon
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.49
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- factor[e] design initiative
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-12-
|
11
|
+
date: 2014-12-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: better_errors
|