andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin'

Browse Source
This commit is contained in:
Andreas Stephanides
2015-01-03 10:54:48 +01:00
parent 3799e5f842 aa080a1eec
commit 81f1db8ff6
81 changed files with 974 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/attachments/_attachment.html.erb
View File

@@ -1,4 +1,4 @@
<% data_ext = attachment.datei.file.extension.downcase %>
<% data_ext = attachment.datei.file.try(:extension).try(:downcase) %>
<% if (!["jpg","png","jpeg"].find_index(data_ext).nil?) %>

21
app/views/calentries/_nested_fields.html.erb
View File

@@ -1,10 +1,15 @@
<div class="row-fluid">
<div class="span1"></div><div class="span1">
<%= fa_icon("calendar 2x") %>
<div class="span1"></div>
<div class="span1">
<%= fa_icon("calendar 2x") %>
</div>
<div class="span4">
<%= f.input :start, :as => :datetimepicker %></div><div class="span4">
<%= f.input :dauer , :as => :string, :append=>"h" %></div><div class="span1">
<% f.input :typ %>
</div>
<div class="span1">
<%= f.check_box :_destroy %>
<%= I18n.t 'common.delete' %>
</div>
</div>
<div class="span4">
<%= f.input :start, :as => :datetimepicker %></div><div class="span4">
<%= f.input :dauer , :as => :string, :append=>"h" %></div><div class="span1">
<% f.input :typ %></div> <div class="span1"><%= f.check_box :_destroy %> <%= I18n.t 'common.delete' %></div>
</div>

9
app/views/calentries/_nested_form.html.erb
View File

@@ -4,10 +4,15 @@
<%= semantic_form_for @calentry, :remote=>true, :html=>{:class=>"inline"} do |f| %>
<%= f.input :start, :as => :datetimepicker %>
<%= f.input :dauer , :as => :string, :append=>"h" %>
<% if @calentry.typ==1 %>
<%= f.input :dauer , :as => :string, :append=>"h" %>
<% else %>
<%= f.input :ende, :as => :datetimepicker %>
<% end %>
<%= f.input :object_id , :as => :hidden %>
<%= f.input :object_type , :as => :hidden %>
<%= f.input :typ , :as => :hidden %>
<%= f.input :typ , :as => :hidden %>
<%= f.action :submit, :as => :input_ %>

9
app/views/documents/_document.html.erb Normal file
View File

@@ -0,0 +1,9 @@
<div class="contentbox" id="document_<%= document.id%>">
<% image_tag("/iconnavy/time.png") %>
<%= fa_icon("file-text") %>
<%= link_to document.name, document %>
<%= link_to "edit", edit_document_path(document),:remote=>true if can? :edit, document %>
<%= link_to 'Delete', document, method: :delete, data: { confirm: 'Are you sure?' } , remote: true if can? :delete, document %>
</div>

7
app/views/documents/_form.html.erb Normal file
View File

@@ -0,0 +1,7 @@
<%= semantic_form_for @document, :html=>{:class=>""} do |f| %>
<%= f.input :text, :as=>:tinymce_text %>
<%= f.action :submit, :as => :input_ %>
<% end %>
<%= tinymce %>

13
app/views/documents/_nested_form.html.erb Normal file
View File

@@ -0,0 +1,13 @@
<%= fa_icon("calendar 2x") %>
<p id="notice"><%= notice %></p>
<%= semantic_form_for @document, :remote=>true, :html=>{:class=>""} do |f| %>
<%= f.input :name %>
<%= f.input :parent_id, :as=>:hidden %>
<%= f.input :parent_type, :as=>:hidden %>
<%= f.action :submit, :as => :input_ %>
<% end %>

1
app/views/documents/create.js.erb Normal file
View File

@@ -0,0 +1 @@
$("#<%= Document.new_divid_for(@parent) %>").replaceWith("<div id=\"<%= Document.new_divid_for(@parent)%>\"></div><%=escape_javascript( render :partial=>"document", :object=>@document)%>");

1
app/views/documents/destroy.js.erb Normal file
View File

@@ -0,0 +1 @@
$("#document_<%= @document_id %>").remove();

7
app/views/documents/edit.js.erb Normal file
View File

@@ -0,0 +1,7 @@
$("#<%= @document.divid %>").html("<%=escape_javascript( render :partial=>"nested_form" ,:object=>@document)%>");

5
app/views/documents/new.js.erb Normal file
View File

@@ -0,0 +1,5 @@
$("#<%= Document.new_divid_for(@parent) %>").replaceWith("<div id=\"<%= Document.new_divid_for(@parent) %>\"><%=escape_javascript( render :partial=>"nested_form" ,:object=>@document) %></div>");

9
app/views/documents/show.html.erb Normal file
View File

@@ -0,0 +1,9 @@
<li><%= link_to "Back to parent" , @document.parent %></li>
<li><%= link_to ff_icon("icon-pencil") + "Edit", write_document_path(@document) %></li>
<li><%= link_to ff_icon("icon-refresh")+"Refresh from Etherpad", read_from_etherpad_document_path(@document) if @document.is_etherpad? %></li>
<li><%= link_to "Copy Document to Etherpad", dump_to_etherpad_document_path(@document) , confirm: "Sicher? Löscht alle Änderungen im Etherpad"%></li>
<h2><%= @document.name %></h2>
<div id="">
<%= raw(@document.text) %>
</div>

1
app/views/documents/update.js.erb Normal file
View File

@@ -0,0 +1 @@
$("#document_<%= @document.id %>").replaceWith("<%=escape_javascript( render :partial=>"document", :object=>@document)%>");

6
app/views/documents/write.html.erb Executable file
View File

@@ -0,0 +1,6 @@
<h1>Editing Dokument</h1>
<%= render 'form' %>
<%= link_to 'Show', @document %> |

1
app/views/documents/write_etherpad.html.erb Normal file
View File

@@ -0,0 +1 @@
<%= link_to "weiter" , "http://www.fet.at/etherpad/p/"+@document.ep_pad.id , target: :blank %>

2
app/views/fragen/_form.html.erb
View File

@@ -1,7 +1,7 @@
<%= tinymce_assets %>
<%= semantic_form_for @frage do |f| %>
<%= f.inputs do %>
<%= f.input :title %>
<%= f.input :title , :as=>:text %>
<%= f.input :thema %>
<%= f.input :text, :as=>:tinymce_text%>
<% end %>

2
app/views/fragen/_rform.html.erb
View File

@@ -1,7 +1,7 @@
<%= tinymce_assets %>
<%= semantic_form_for @frage , :remote=>true do |f| %>
<%= f.inputs do %>
<%= f.input :title %>
<%= f.input :title, :as=>:text %>
<%= f.input :thema %>
<%= f.input :text, :as=>:tinymce_text%>
<% end %>

3
app/views/home/index.html.erb
View File

@@ -1,5 +1,6 @@
<div class="content-wrap content-column">
<h1><%= I18n.t('home.willkommen') %></h1></p>
<h1><%= I18n.t('home.willkommen') %></h1>
<%= render partial: "themen/small", object: @starttopic %>
<div class="container-fluid">
<div class="row-fluid">
<div class="span6">

3
app/views/home/kontakt.html.erb
View File

@@ -3,8 +3,5 @@
<% @themen.each do |th| %>
<%= render partial: "themen/small", object: th %>
<% end %>
</div>

24
app/views/layouts/_login.html.erb
View File

@@ -1,9 +1,17 @@
<% if user_signed_in? %>
<li>Logged in as : <%= current_user.email %>
<%= link_to('Logout', destroy_user_session_path, :method => :delete) %>
</li>
<% else %>
<li>
<%= link_to('Login', new_user_session_path) %>
</li>
<% end %>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= ff_icon('icon-user')%><b class="caret"></b></a>
<ul class="dropdown-menu">
<li style="padding:5px">
<%= image_tag current_user.fetprofile.picture.thumb.url,class: "pull-left" unless current_user.fetprofile.nil? %>
<%= current_user.email %> is logged in.
</li>
<li><%= link_to('Logout', destroy_user_session_path, :method => :delete) %> </li>
</ul>
</li>
<% else %>
<li>
<%= link_to('Login', new_user_session_path) %>
</li>
<% end %>

BIN
app/views/layouts/application.html.erb
View File

Binary file not shown.

7
app/views/layouts/menu.html.erb
View File

@@ -35,15 +35,18 @@
</ul>
</li>
</ul>
<%= render 'layouts/login' %>
</ul>
<!--<span class="pull-right"><%if I18n.locale == :en %>
<%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%>
<% elsif I18n.locale == :de %>
<%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%>
<%end %>
</span>-->
</div>
</div>
</div>
</div>

15
app/views/meetings/_meeting.html.erb Normal file
View File

@@ -0,0 +1,15 @@
<div class="contentbox" id="meeting_<%= meeting.id%>">
<b><%= link_to meeting.text, meeting %></b>
<%= link_to "Ankündigung", rubrik_neuigkeit_path(meeting.neuigkeit.rubrik, meeting.neuigkeit) unless meeting.neuigkeit.nil? %>
<%= link_to "ankündigen", announce_meeting_path(meeting), remote: true if meeting.neuigkeit.nil? %>
<%= link_to "edit", edit_meeting_path(meeting), remote: true %>
<%= link_to 'Delete', meeting, method: :delete, data: { confirm: 'Are you sure?' } , remote: true if can? :delete, meeting %>
<%= render meeting.calentry unless meeting.calentry.nil? %>
<%= link_to "Agenda" , create_agenda_meeting_path(meeting), :remote=>true if meeting.agenda.nil? %>
<%= link_to "Protokoll" , create_protocol_meeting_path(meeting),:remote=>true if meeting.protocol.nil? %>
<%= render meeting.agenda unless meeting.agenda.nil? %>
<%= render meeting.protocol unless meeting.protocol.nil? %>
</div>

7
app/views/meetings/_meeting_list.html.erb Normal file
View File

@@ -0,0 +1,7 @@
<div id="meetings_for_<%= parent.class.to_s %>_<%= parent.id.to_s %>">
<% unless meeting_list.empty? %>
<% meeting_list.each do |m| %>
<%= render m %>
<% end%>
<% end%>
</div>

23
app/views/meetings/_nested_form.html.erb Normal file
View File

@@ -0,0 +1,23 @@
<%= fa_icon("calendar 2x") %>
<p id="notice"><%= notice %></p>
<%= semantic_form_for @meeting, :remote=>true, :html=>{:class=>""} do |f| %>
<%= f.input :name %>
<%= f.input :meetingtyp %>
<%= f.semantic_fields_for :calentry, @meeting.calentry do |ff| %>
<%= ff.input :start, :as => :datetimepicker %>
<%= ff.input :ende, :as => :datetimepicker %>
<%= ff.input :typ %>
<% ff.input :object_id, :as=>:hidden %>
<% ff.input :object_type %>
<% end %>
<%= f.input :parent_id, :as=>:hidden %>
<%= f.input :parent_type, :as=>:hidden %>
<%= f.action :submit, :as => :input_ %>
<% end %>
<%= @meeting.calentry.to_yaml %>

1
app/views/meetings/create.js.erb Normal file
View File

@@ -0,0 +1 @@
$("#<%= Meeting.new_divid_for(@parent) %>").replaceWith("<div id=\"<%= Meeting.new_divid_for(@parent)%>\"></div><%=escape_javascript( render :partial=>"meeting", :object=>@meeting)%>");

1
app/views/meetings/destroy.js.erb Normal file
View File

@@ -0,0 +1 @@
$("#meeting_<%= @meeting_id %>").remove();

5
app/views/meetings/edit.js.erb Normal file
View File

@@ -0,0 +1,5 @@
$("#<%= @meeting.divid %>").html("<%=escape_javascript( render :partial=>"nested_form" ,:object=>@meeting)%>");

1
app/views/meetings/index.js.erb Normal file
View File

@@ -0,0 +1 @@
$("#meetings_for_<%= @parent.class.to_s %>_<%= @parent.id.to_s %>").replaceWith("<%=escape_javascript( render :partial=>"meetings/meeting_list", object: @meetings, locals: {parent: @parent} ) %>");

3
app/views/meetings/new.js.erb Normal file
View File

@@ -0,0 +1,3 @@
$("#<%= Meeting.new_divid_for(@parent) %>").replaceWith("<div id=\"<%= Meeting.new_divid_for(@parent) %>\"><%=escape_javascript( render :partial=>"nested_form" ,:object=>@meeting) %></div>");

1
app/views/meetings/show.js.erb Normal file
View File

@@ -0,0 +1 @@
$("#meeting_<%= @meeting.id %>").replaceWith("<%=escape_javascript( render :partial=>"meeting", :object=>@meeting)%>");

1
app/views/meetings/update.js.erb Normal file
View File

@@ -0,0 +1 @@
$("#meeting_<%= @meeting.id %>").replaceWith("<%=escape_javascript( render :partial=>"meeting", :object=>@meeting)%>");

16
app/views/neuigkeiten/_nlink_list_search_whole.html.erb
View File

@@ -1,5 +1,19 @@
<div id="nlink_list_search">
<ul class="unstyled">
<%= render partial: "nlink_list_search", collection: nlink_list_search_whole %>
<% unless @results.nil? %>
<ul class="unstyled linkbox-list">
<% @results.results.each do |res| %>
<% if can?(:show, res) %>
<li>
<%= link_to create_link_rubrik_neuigkeit_path(@neuigkeit.rubrik, @neuigkeit, :link_id=>res.id, :link_type=>res.class.to_s), remote: true, class: :linkbox do %>
<%= render :partial=>res.class.to_s.pluralize.downcase+"/nlink", :object=>res %>
<% end %>
</li>
<% end %>
<% end %>
</ul>
<% end %>
<% render partial: "nlink_list_search", collection: nlink_list_search_whole %>
</ul>
</div>

3
app/views/neuigkeiten/show.html.erb
View File

@@ -50,6 +50,9 @@ end
<%= render ce unless ce.nil? %>
<% end %>
</div>
<% unless @neuigkeit.meeting.nil? %>
<%= render @neuigkeit.meeting %>
<% end%>
<div id="calentry_new" ><%= link_to "new Calentry", new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), :remote=>true if can? :edit, @neuigkeit %></div>
<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
</div>

5
app/views/rubriken/show.html.erb
View File

@@ -1,4 +1,6 @@
<%= content_for :header do %>
<title>Fetsite - <%= @rubrik.name %></title>
<% set_meta_tags :og => {
:title => @rubrik.name.to_s,
@@ -8,7 +10,9 @@
<%= display_meta_tags %>
<% end %>
<%= render 'tabs' %>
<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
<p id="notice"><%= notice %></p>
<div class="content-wrap content-column">
<div class="container-fluid">
@@ -52,7 +56,6 @@
</div>
<br>
<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
</div>
</div>

16
app/views/themen/_documents.html.erb Normal file
View File

@@ -0,0 +1,16 @@
<% if can?(:edit,@thema)|| ! @thema.documents.empty? %>
<b>Dokumente</b>
<%= link_to "Neues Dokument", new_document_path(:parent_id=>@thema.id, :parent_type=>"Thema"), :remote=>true %>
<div id="<%= Document.new_divid_for(@thema) %>"></div>
<% unless @documents.empty? %>
<% @documents.each do |d| %>
<%= render d %>
<% end%>
<% end%>
<% end%>

35
app/views/themen/_small.html.erb
View File

@@ -8,8 +8,8 @@
<% if small.isdraft %>
<div class="sticker sticker-yellow"><%= I18n.t("thema.isdraft") %> </div>
<% end %>
<%= raw(small.text) %>
<% end %><div>
<%= raw(small.text) %></div>
<br/>
<%= raw("<b>FAQs:</b>") unless small.fragen.empty? %>
@@ -20,6 +20,37 @@
<%= raw(frage.text) %>
</p>
<% end %>
<% if can?(:edit,small) || !small.meetings.empty? %>
<b>Treffen/Sitzungen</b>
<%= link_to "Neues Meeting", new_meeting_path(:parent_id=>small.id, :parent_type=>"Thema"), :remote=>true %>
<div id="<%= Meeting.new_divid_for(small) %>"></div>
<%= link_to "All", meetings_path(:parent_id=>small.id, :parent_type=>"Thema"), :remote=>true %>
<%= link_to "upcomming", meetings_path(:parent_id=>small.id, :parent_type=>"Thema",:filter=>"upcomming"), :remote=>true %>
<%= render :partial=>"meetings/meeting_list", object: small.meetings, locals: {parent: small} %>
<% end %>
<% if can?(:edit,small)|| ! small.documents.empty? %>
<b>Dokumente</b>
<%= link_to "Neues Dokument", new_document_path(:parent_id=>small.id, :parent_type=>"Thema"), :remote=>true %>
<div id="<%= Document.new_divid_for(small) %>"></div>
<% unless small.documents.empty? %>
<% small.documents.each do |d| %>
<%= render d %>
<% end%>
<% end%>
<% end%>
<% unless small.hideattachment %>
<%= render partial: "themen/attachment_list", object: small.attachments, locals:{editor: false} unless small.attachments.empty? %>
<% end %>

3
app/views/themen/_verw_liste.html.erb
View File

@@ -9,6 +9,9 @@
<li><%= link_to sanitize_thema_path(thema),:remote=>true do %> <%= ff_icon('icon-leaf') %> Sanitize <% end %> </li>
<li><%= link_to fragen_thema_path(thema),:remote=>true do %> Fragen <% end %></li>
<li><%= link_to documents_thema_path(thema),:remote=>true do %> Fragen <% end %></li>
<li><%= link_to meetings_thema_path(thema),:remote=>true do %> Fragen <% end %></li>
<li><%= link_to attachments_thema_path(thema),:remote=>true do %> Attachments <% end %></li>
</ul>
</li>

1
app/views/themen/documents.js.erb Normal file
View File

@@ -0,0 +1 @@
$("#themaview").html("<%=escape_javascript( render :partial=>'themen/documents' )%>")

5
app/views/themes/blue1/home/index.html.erb
View File

@@ -1,5 +1,8 @@
<div class="content-wrap content-column">
<h1><%= I18n.t('home.willkommen') %></h1></p>
<h1><%= I18n.t('home.willkommen') %></h1>
<%= raw(@starttopic.text) %>
<div class="container-fluid">
<div class="row-fluid">
<div class="span6">