junebug 0.0.11 → 0.0.12
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/CHANGELOG +4 -0
- data/Rakefile +1 -1
- data/deploy/static/style/base.css +2 -2
- data/lib/junebug/views.rb +33 -37
- metadata +1 -1
data/CHANGELOG
CHANGED
data/Rakefile
CHANGED
@@ -12,7 +12,7 @@ Gem.manage_gems
|
|
12
12
|
|
13
13
|
gem_spec = Gem::Specification.new do |s|
|
14
14
|
s.name = 'junebug'
|
15
|
-
s.version = '0.0.
|
15
|
+
s.version = '0.0.12'
|
16
16
|
s.summary = "Junebug is a minimalist ruby wiki."
|
17
17
|
s.description = "Junebug is a minimalist ruby wiki running on Camping."
|
18
18
|
s.author = "Tim Myrtle"
|
@@ -77,7 +77,6 @@ body {
|
|
77
77
|
background-color: #ffffff;
|
78
78
|
border:5px solid #929292;
|
79
79
|
border-width:0 5px 5px 0;
|
80
|
-
padding: 25px;
|
81
80
|
min-height: 300px;
|
82
81
|
}
|
83
82
|
|
@@ -144,7 +143,8 @@ body {
|
|
144
143
|
|
145
144
|
/* WIKI CONTENT STYLES */
|
146
145
|
.content {
|
147
|
-
font-size:
|
146
|
+
font-size: 114%;
|
147
|
+
padding: 25px;
|
148
148
|
}
|
149
149
|
|
150
150
|
.content a:link, .content a:visited, .content a:hover {
|
data/lib/junebug/views.rb
CHANGED
@@ -23,11 +23,9 @@ module Junebug::Views
|
|
23
23
|
def show
|
24
24
|
_header (@version.version == @page.version ? :show : :backlinks), @page.title
|
25
25
|
_body {
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
_button 'edit', R(Edit, @page.title, @version.version), {:style=>'float: right; margin: 0 0 5px 5px;'} if (@version.version == @page.version && (! @page.readonly || @state.user_id == 1)) && (@version.body && @version.body.size > 100)
|
30
|
-
}
|
26
|
+
_button 'edit', R(Edit, @page.title, @version.version), {:style=>'float: right; margin: 0 0 5px 5px;'} if (@version.version == @page.version && (! @page.readonly || @state.user_id == 1))
|
27
|
+
_markup @version.body
|
28
|
+
_button 'edit', R(Edit, @page.title, @version.version), {:style=>'float: right; margin: 0 0 5px 5px;'} if (@version.version == @page.version && (! @page.readonly || @state.user_id == 1)) && (@version.body && @version.body.size > 100)
|
31
29
|
}
|
32
30
|
_footer {
|
33
31
|
text "Last edited by <b>#{@version.user.username}</b> on #{@page.updated_at.strftime('%B %d, %Y %I:%M %p')}"
|
@@ -59,34 +57,32 @@ module Junebug::Views
|
|
59
57
|
def edit
|
60
58
|
_header :backlinks, @page.title
|
61
59
|
_body {
|
62
|
-
div.
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
br
|
83
|
-
end
|
84
|
-
input :type => 'submit', :name=>'submit', :value=>'cancel', :class=>'button', :style=>'float: right;'
|
85
|
-
input :type => 'submit', :name=>'submit', :value=>'save', :class=>'button', :style=>'float: right;'
|
60
|
+
div.formbox {
|
61
|
+
form :method => 'post', :action => R(Edit, @page.title) do
|
62
|
+
p {
|
63
|
+
label 'Page Title'
|
64
|
+
br
|
65
|
+
input :value => @page.title, :name => 'post_title', :size => 30,
|
66
|
+
:type => 'text'
|
67
|
+
small " [ CamelCase only ]"
|
68
|
+
}
|
69
|
+
p {
|
70
|
+
label 'Page Content'
|
71
|
+
br
|
72
|
+
textarea @page.body, :name => 'post_body', :rows => 17, :cols => 80
|
73
|
+
}
|
74
|
+
if @state.user_id == 1
|
75
|
+
opts = { :type => 'checkbox', :value=>'1', :name => 'post_readonly' }
|
76
|
+
opts[:checked] = 1 if @page.readonly
|
77
|
+
input opts
|
78
|
+
text " Readonly"
|
79
|
+
br
|
86
80
|
end
|
87
|
-
|
88
|
-
|
89
|
-
|
81
|
+
input :type => 'submit', :name=>'submit', :value=>'cancel', :class=>'button', :style=>'float: right;'
|
82
|
+
input :type => 'submit', :name=>'submit', :value=>'save', :class=>'button', :style=>'float: right;'
|
83
|
+
end
|
84
|
+
a 'syntax help', :href => 'http://hobix.com/textile/', :target=>'_blank'
|
85
|
+
br :clear=>'all'
|
90
86
|
}
|
91
87
|
}
|
92
88
|
_footer { '' }
|
@@ -247,15 +243,15 @@ module Junebug::Views
|
|
247
243
|
end
|
248
244
|
|
249
245
|
def _body
|
250
|
-
div
|
251
|
-
div :id=>'
|
252
|
-
div :
|
253
|
-
div
|
246
|
+
div :id=>'bd' do
|
247
|
+
div :id=>'yui-main' do
|
248
|
+
div :class=>'yui-b' do
|
249
|
+
div.content do
|
254
250
|
yield
|
255
251
|
end
|
256
252
|
end
|
257
253
|
end
|
258
|
-
|
254
|
+
end
|
259
255
|
end
|
260
256
|
|
261
257
|
def _footer
|