bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://github.com/fetsite/fetsite

Browse Source
This commit is contained in:
Andreas Stephanides
2014-07-09 23:51:38 +05:30
parent 38394df7c3 397721f89e
commit adaf924fd7
3 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile.lock
View File

@@ -123,6 +123,7 @@ GEM
httpclient (2.4.0) httpclient (2.4.0)
i18n (0.6.1) i18n (0.6.1)
journey (1.0.4) journey (1.0.4)
jquery-datetimepicker-rails (2.2.5.0)
jquery-fileupload-rails (0.4.1) jquery-fileupload-rails (0.4.1)
actionpack (>= 3.1) actionpack (>= 3.1)
railties (>= 3.1) railties (>= 3.1)
@@ -248,7 +249,7 @@ GEM
ref ref
thor (0.18.1) thor (0.18.1)
tilt (1.4.1) tilt (1.4.1)
tinymce-rails (3.5.8) tinymce-rails (4.1.0)
railties (>= 3.1.1) railties (>= 3.1.1)
treetop (1.4.15) treetop (1.4.15)
polyglot polyglot
@@ -289,6 +290,7 @@ DEPENDENCIES
globalize-versioning globalize-versioning
gollum-lib gollum-lib
haml haml
jquery-datetimepicker-rails
jquery-fileupload-rails jquery-fileupload-rails
jquery-rails jquery-rails
jquery-ui-rails (~> 4.1.1) jquery-ui-rails (~> 4.1.1)
@@ -310,7 +312,7 @@ DEPENDENCIES
sqlite3 sqlite3
themes_for_rails themes_for_rails
therubyracer therubyracer
tinymce-rails (~> 3.5.8) tinymce-rails (~> 4.1.0)
uglifier (>= 1.0.3) uglifier (>= 1.0.3)
webrick (= 1.3.1) webrick (= 1.3.1)
wikicloth wikicloth

8
app/views/home/_search_results.html.erb
View File

@@ -27,12 +27,16 @@
<h2>Themen</h2> <h2>Themen</h2>
<% end %> <% end %>
<% @themen.each do |thema| %>
<ul class="unstyled content-list" style="max-width:70em"> <ul class="unstyled content-list" style="max-width:70em">
<% @themen.each do |thema| %>
<% if can? :show, thema %>
<li><%= link_to thema.title,thema %> <li><%= link_to thema.title,thema %>
<div class="contentbox"> <div class="contentbox">
<%= render :partial=>"themen/small", :object=>thema %> <%= render :partial=>"themen/small", :object=>thema %>
</div> </div>
</li> </li>
</ul>
<% end %> <% end %>
<% end %>
</ul>

23
app/views/themen/_form.html.erb
View File

@@ -31,21 +31,38 @@
<%= f.input :text, :as=>:tinymce_text,:label=>false, :input_html=>{:rows=>20} %> <%= f.input :text, :as=>:tinymce_text,:label=>false, :input_html=>{:rows=>20} %>
</div> </div>
</div> </div>
</div>
<div class="row-fluid">
<div class="span12">
<% unless I18n.locale == :de %> <% unless I18n.locale == :de %>
<% I18n.with_locale(:de) do %> <% I18n.with_locale(:de) do %>
<%= raw(@thema.text) %> <%= raw(@thema.text) %>
<% end %><% end %> <% end %>
<% end %>
</div>
</div>
<div class="row-fluid">
<div class="span12">
<%= f.actions do %> <%= f.actions do %>
<%= f.action :submit, :as => :button, :label=> I18n.t("thema.save" ) %> <%= f.action :submit, :as => :button, :label=> I18n.t("thema.save" ) %>
<%= f.action :submit, :as => :button, :label=> I18n.t("thema.savecont"), :button_html=>{:value=>"continue"} %> <%= f.action :submit, :as => :button, :label=> I18n.t("thema.savecont"), :button_html=>{:value=>"continue"} %>
<%= f.action :cancel, :as => :link %> <%= f.action :cancel, :as => :link %>
<% end %> <% end %>
<% end %><% end %> </div>
</div>
<% end %>
<% end %>
<%= tinymce %> <%= tinymce %>
</div>
<%= tinymce_icon_choice %> <%= tinymce_icon_choice %>
<h2>Attachments:</h2> <h2>Attachments:</h2>
<%= render :partial => "themen/select", :object => @thema,:locals =>{ :editor => :true} %> <%= render :partial => "themen/select", :object => @thema,:locals =>{ :editor => :true} %>