merb-ui 0.4.5 → 0.4.6
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/Rakefile +1 -1
- data/app/helpers/global_helpers.rb +15 -9
- data/app/views/styles/index.css.erb +12 -0
- metadata +2 -2
data/Rakefile
CHANGED
@@ -43,7 +43,12 @@ module Merb::GlobalHelpers
|
|
43
43
|
copyright_owner = " #{MerbUi[:owner]}" if MerbUi[:owner]
|
44
44
|
copyright_text = "Copyright © #{copyright_years}#{copyright_owner}. All rights reserved."
|
45
45
|
copyright = tag(:div, copyright_text, :class => 'mui_copyright')
|
46
|
-
|
46
|
+
content = tag(:div, catch_content(:for_layout) + copyright, attributes)
|
47
|
+
if thrown_content? :mui_sidebar
|
48
|
+
body << tag(:table, tag(:tr, tag(:td, catch_content(:mui_sidebar), :class => 'mui_sidebar') + tag(:td, content), :valign => 'top'), :class => 'mui_grid')
|
49
|
+
else
|
50
|
+
body << content
|
51
|
+
end
|
47
52
|
body << tag(:div, :class => 'mui_window_target')
|
48
53
|
body << tag(:div, :class => 'mui_message_target')
|
49
54
|
if session[:mui_window]
|
@@ -178,14 +183,6 @@ module Merb::GlobalHelpers
|
|
178
183
|
jquery + jquery_ui + include_required_js + include_required_css + catch_content(:feeds)
|
179
184
|
end
|
180
185
|
|
181
|
-
def mui_textarea(name, options = {})
|
182
|
-
attributes = {}
|
183
|
-
attributes[:class] = 'mui_textarea'
|
184
|
-
attributes[:class] << ' mui_focus' if options[:focus] == true
|
185
|
-
attributes[:label] = options[:title]
|
186
|
-
text_area(name, attributes)
|
187
|
-
end
|
188
|
-
|
189
186
|
def mui_image(options={})
|
190
187
|
attributes={}
|
191
188
|
attributes[:align] = options[:align] if options[:align]
|
@@ -260,6 +257,7 @@ module Merb::GlobalHelpers
|
|
260
257
|
def mui_search(options = {})
|
261
258
|
attributes = {}
|
262
259
|
attributes[:class] = 'mui_input mui_search'
|
260
|
+
attributes[:class] << ' mui_focus' if options[:focus] == true
|
263
261
|
attributes[:name] = :q
|
264
262
|
attributes[:style] = "width:#{options[:width]};" if options[:width]
|
265
263
|
attributes[:type] = :text
|
@@ -317,6 +315,14 @@ module Merb::GlobalHelpers
|
|
317
315
|
text_field(name, attributes)
|
318
316
|
end
|
319
317
|
|
318
|
+
def mui_textarea(name, options = {})
|
319
|
+
attributes = {}
|
320
|
+
attributes[:class] = 'mui_textarea'
|
321
|
+
attributes[:class] << ' mui_focus' if options[:focus] == true
|
322
|
+
attributes[:label] = options[:title]
|
323
|
+
text_area(name, attributes)
|
324
|
+
end
|
325
|
+
|
320
326
|
def mui_title(options = {})
|
321
327
|
size = options[:title_size] || '1.5em'
|
322
328
|
attributes = {}
|
@@ -316,6 +316,18 @@ p.mui_paragraph+p.mui_paragraph {
|
|
316
316
|
margin-right: 0.5em;
|
317
317
|
}
|
318
318
|
|
319
|
+
/* sidebar */
|
320
|
+
|
321
|
+
.mui_sidebar {
|
322
|
+
background-color: <%= color(0.25, 0.25, 0.25) %>;
|
323
|
+
border: 0 solid <%= color(0, 0, 0) %>;
|
324
|
+
border-right-width: 1px;
|
325
|
+
white-space: nowrap;
|
326
|
+
}
|
327
|
+
.mui_sidebar .mui_link {
|
328
|
+
color: <%= color(1, 1, 1) %>;
|
329
|
+
}
|
330
|
+
|
319
331
|
/* status */
|
320
332
|
|
321
333
|
.mui_status {
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: merb-ui
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- UiPoet
|
@@ -9,7 +9,7 @@ autorequire:
|
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
|
12
|
-
date: 2008-12-
|
12
|
+
date: 2008-12-23 00:00:00 -08:00
|
13
13
|
default_executable:
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|