social_stream-documents 2.0.1 → 2.0.2

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: 4721c320868c20d50481d4ec29c77e0883f79cb4
4
- data.tar.gz: b52c938dfa9dca7a158484ee02d440713b2bf75d
3
+ metadata.gz: 14eb2d33b7fcbdd79dd2829dc0f7f552d197248d
4
+ data.tar.gz: 581cb6aa512adc9c8418b0191a43ea093a180c2f
5
5
  SHA512:
6
- metadata.gz: 4da14f1c1275f76e17ac6b0d8bb1be7ef5474680ac1eb8206b45139e7d1b4a86e5fc7d18adc26e787730f9981b35294a5c5465de9cda40e7f6cf54d3d347c5ca
7
- data.tar.gz: 7b06f026a1e5e04c039818400329ead79a9237ef7376a3d1b18ded238bb66e84b08b824e15228ffd2ec4c80b326c9181851bf436d5cff01b335eda0154c5b03d
6
+ metadata.gz: 9c9afbeb4fcf282ec2971e63afa3469a1e619c1ca1f5da6222463926fe9edf59943a3280c84e1198f32d233c3d8d830b4ea8d15abfcdb62c258724b86b79c812
7
+ data.tar.gz: ea3f6f9bf048bf057601125f1220235e1b1fe4f9872c970d1adb2ace3af205332e4d207c54eeec7568f6abd9eb79226f8570b7807072717d9ac932ac70eb334b
@@ -1,35 +1,7 @@
1
- #new_document-modal
2
- .modal-body
3
- max-height: 520px
4
- padding: 0 15px 15px 15px
5
- .tags
6
- .select2-container
7
- width: 98.5%
8
- form.new_site_client
9
- margin-left: 0px
10
- width: 100%
11
- .name,
12
- .url
13
- margin-left: 0px
14
- width: 100%
15
- input
16
- &[type="file"]
17
- line-height: 0px
18
- #new_file
19
- label
20
- font-size: 22px
21
- font-weight: bold
22
- color: #CCC
23
- form.new_document
24
- section
25
- border-bottom: 1px dashed #CCC
26
- padding-top: 15px
27
- padding-bottom: 15px
28
- #document_file
29
- @include ellipsis
30
- .description
31
- textarea
32
- height: 100px
33
- input
34
- &[type="submit"]
35
- margin: 8px 0 0
1
+ #new_file
2
+ @include grid-core-span(7, $fluidGridColumnWidth, $fluidGridGutterWidth)
3
+ float: left
4
+ margin-left: 2.5%
5
+ h5
6
+ font-size: 28px
7
+ color: $red
@@ -1,7 +1,6 @@
1
- #repository
2
- .repository
3
- h1
4
- @include colorfont-big-size
5
- .btn
6
- @include btn-primary
7
-
1
+ .documents,
2
+ .repository
3
+ h1
4
+ @include colorfont-big-size
5
+ .btn
6
+ @include btn-primary
@@ -1,4 +1,5 @@
1
- div.repository
1
+ div.repository,
2
+ .documents
2
3
  @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
3
4
  float: left
4
5
  margin-left: 2.5%
@@ -28,7 +29,7 @@ section.repository
28
29
  .tab-content
29
30
  @include grid-core-span(10, $fluidGridColumnWidth, $fluidGridGutterWidth)
30
31
  padding-bottom: 100px
31
-
32
+
32
33
  .repository-list
33
34
  .document,
34
35
  .picture,
@@ -52,7 +53,20 @@ section.repository
52
53
  margin-left: 44px
53
54
 
54
55
  .documents
55
- clear: both
56
+
57
+ input
58
+ &[type="text"]
59
+ width: 24% !important
60
+ display: inline
61
+ margin-top: 20px
62
+ float: left
63
+ margin-left: 20px
64
+ .btn
65
+ float: right
66
+ width: auto
67
+ display: inline-block
68
+ margin: 23px 16px 0 -14px
69
+
56
70
  #new_document-modal
57
71
  .modal-body
58
72
  input
@@ -1,6 +1,7 @@
1
1
  #search-results,
2
2
  .repository-list-net,
3
- .repository-list
3
+ .repository-list,
4
+ .documents
4
5
  .picture,
5
6
  .audio,
6
7
  .video,
@@ -4,10 +4,11 @@
4
4
  #jp_interface_audio_290
5
5
  border: none
6
6
 
7
- div.jp-progress
7
+ .jp-progress
8
8
  width: 98.5% !important
9
- border-bottom: 2px solid #ddd
10
- border-right: 2px solid #666
9
+ border-bottom: 2px solid #444 !important
10
+ border-right: 2px solid #666 !important
11
+ background-color: #333 !important
11
12
  div.jp-seek-bar
12
13
  background: none
13
14
  width: 100%
@@ -0,0 +1,4 @@
1
+ <!-- insert_after "code[erb-loud]:contains('text_field_tag')" -->
2
+
3
+ <%= render partial: 'common_documents/new_button',
4
+ locals: { owner: profile_or_current_subject } %>
@@ -3,27 +3,31 @@
3
3
  <% end %>
4
4
 
5
5
  <%= render partial: 'toolbar/profile', locals: { :subject => profile_or_current_subject } %>
6
+ <div class="documents">
7
+ <h1 class="colorfont">
8
+ <%= t 'document.title.other' %>
9
+ </h1>
6
10
 
7
- <%= render partial: 'common_documents/filter' %>
11
+ <%= render partial: 'common_documents/filter' %>
8
12
 
9
- <%= render partial: 'common_documents/new_button',
10
- locals: { owner: profile_or_current_subject } %>
13
+ <%= render partial: 'common_documents/new_button',
14
+ locals: { owner: profile_or_current_subject } %>
11
15
 
12
- <section class="documents">
13
- <%= render partial: 'common_documents/list',
14
- locals: { documents: collection } %>
15
- </section>
16
-
17
-
18
- <nav class="documents">
19
- <%= render partial: 'layouts/more',
20
- locals: {
21
- path: polymorphic_path([profile_subject, Document.new ]),
22
- per_page: Document.default_per_page,
23
- total: collection.total_count
24
- } %>
25
- </nav>
16
+ <section class="documents">
17
+ <%= render partial: 'common_documents/list',
18
+ locals: { documents: collection } %>
19
+ </section>
26
20
 
21
+
22
+ <nav class="documents">
23
+ <%= render partial: 'layouts/more',
24
+ locals: {
25
+ path: polymorphic_path([profile_subject, Document.new ]),
26
+ per_page: Document.default_per_page,
27
+ total: collection.total_count
28
+ } %>
29
+ </nav>
30
+ </div>
27
31
 
28
32
  <%= javascript_tag do %>
29
33
  $(function() {
@@ -1,5 +1,4 @@
1
1
  <section id="documents">
2
- <h1><%= t 'document.title.other' %></h1>
3
2
 
4
3
  <% if profile_or_current_subject.present? %>
5
4
  <%= render :partial => 'common_documents/index', :locals => { :documents => collection } %>
@@ -2,8 +2,10 @@
2
2
  <%= "#{ current_subject.name }: #{ t('document.new.title') }" %>
3
3
  <% end %>
4
4
 
5
- <%= render partial: 'toolbar/profile', locals: { subject: current_subject } %>
5
+ <section id="new_document">
6
+ <%= render partial: 'toolbar/profile', locals: { subject: current_subject } %>
6
7
 
7
- <h1><%= t 'document.new.title' %></h1>
8
+ <h1><%= t 'document.new.title' %></h1>
8
9
 
9
- <%= render partial: 'common_documents/form', locals: { document: @document } %>
10
+ <%= render partial: 'common_documents/form', locals: { document: @document } %>
11
+ </section>
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Documents
3
- VERSION = "2.0.1".freeze
3
+ VERSION = "2.0.2".freeze
4
4
  end
5
5
  end
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
12
12
  s.files = `git ls-files`.split("\n")
13
13
 
14
14
  # Gem dependencies
15
- s.add_runtime_dependency('social_stream-base', '~> 2.0.1')
15
+ s.add_runtime_dependency('social_stream-base', '~> 2.0.2')
16
16
 
17
17
  s.add_runtime_dependency('paperclip','~> 3.3.0')
18
18
  s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.9.0')
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: social_stream-documents
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.1
4
+ version: 2.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Víctor Sánchez Belmar
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-05-21 00:00:00.000000000 Z
12
+ date: 2013-05-29 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: social_stream-base
@@ -17,14 +17,14 @@ dependencies:
17
17
  requirements:
18
18
  - - ~>
19
19
  - !ruby/object:Gem::Version
20
- version: 2.0.1
20
+ version: 2.0.2
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
25
  - - ~>
26
26
  - !ruby/object:Gem::Version
27
- version: 2.0.1
27
+ version: 2.0.2
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: paperclip
30
30
  requirement: !ruby/object:Gem::Requirement
@@ -121,6 +121,7 @@ files:
121
121
  - app/models/document.rb
122
122
  - app/models/picture.rb
123
123
  - app/models/video.rb
124
+ - app/overrides/repositories/_filter/add_new_document_button.html.erb.deface
124
125
  - app/views/audios/_audio.html.erb
125
126
  - app/views/audios/_audio_processed.html.erb
126
127
  - app/views/audios/_audio_processing.html.erb