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

Merge branch 'master' of https://github.com/Inachos/fetsite into testgallery

Browse Source 
Conflicts:
	app/views/layouts/application.html.erb
This commit is contained in:
Andreas Stephanides
2015-01-15 15:40:36 +01:00
parent 565024c282 48e3c1149a
commit 43a551fc28
56 changed files with 1154 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/fetmeetings/_form.html.erb Normal file
View File

@@ -0,0 +1,14 @@
<%= semantic_form_for @fetmeeting do |f| %>
<%= f.inputs do %>
<%= f.input :tnlist %>
<%= f.input :typ %>
<%= f.semantic_fields_for :calentry , @fetmeeting.calentry do |calentry| %>
<%= render 'calentries/nested_fields', :f => calentry %>
<% end %>
<% end %>
<%= f.actions do %>
<%= f.action :submit, :as => :input %>
<% end %>
<% end %>

6
app/views/fetmeetings/edit.html.erb Normal file
View File

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

25
app/views/fetmeetings/index.html.erb Normal file
View File

@@ -0,0 +1,25 @@
<h1>Listing fetmeetings</h1>
<table>
<tr>
<th>Tnlist</th>
<th>Typ</th>
<th></th>
<th></th>
<th></th>
</tr>
<% @fetmeetings.each do |fetmeeting| %>
<tr>
<td><%= fetmeeting.tnlist %></td>
<td><%= fetmeeting.typ %></td>
<td><%= link_to 'Show', fetmeeting %></td>
<td><%= link_to 'Edit', edit_fetmeeting_path(fetmeeting) %></td>
<td><%= link_to 'Destroy', fetmeeting, method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<% end %>
</table>
<br />
<%= link_to 'New Fetmeeting', new_fetmeeting_path %>

5
app/views/fetmeetings/new.html.erb Normal file
View File

@@ -0,0 +1,5 @@
<h1>New fetmeeting</h1>
<%= render 'form' %>
<%= link_to 'Back', fetmeetings_path %>

20
app/views/fetmeetings/show.html.erb Normal file
View File

@@ -0,0 +1,20 @@
<p id="notice"><%= notice %></p>
<p>
<b>Tnlist:</b>
<%= @fetmeeting.tnlist %>
</p>
<p>
<b>Typ:</b>
<%= @fetmeeting.typ %>
</p>
<p>
<ul>
<% @fetmeeting.fetmeetingtops.each do |top|%>
<li><%= render top %></li>
<% end %>
</ul>
</p>
<%= link_to 'Edit', edit_fetmeeting_path(@fetmeeting) %> |
<%= link_to 'Back', fetmeetings_path %>

1
app/views/fetmeetingtops/_fetmeetingtop.html.erb Normal file
View File

@@ -0,0 +1 @@
<%= fetmeetingtop.title %> (<i><%= fetmeetingtop.ersteller %></i>)

14
app/views/fetmeetingtops/_form.html.erb Normal file
View File

@@ -0,0 +1,14 @@
<%= semantic_form_for @fetmeetingtop do |f| %>
<%= f.inputs do %>
<%= f.input :title %>
<%= f.input :text %>
<%= f.input :discussion , as: :tinymce_text %>
<%= f.input :ersteller %>
<%= f.input :fetmeeting_id %>
<% end %>
<%= f.actions do %>
<%= f.action :submit, :as => :input %>
<% end %>
<% end %>
<%= tinymce %>

6
app/views/fetmeetingtops/edit.html.erb Normal file
View File

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

31
app/views/fetmeetingtops/index.html.erb Normal file
View File

@@ -0,0 +1,31 @@
<h1>Listing fetmeetingtops</h1>
<table>
<tr>
<th>Title</th>
<th>Text</th>
<th>Discussion</th>
<th>Ersteller</th>
<th>Fetmeeting</th>
<th></th>
<th></th>
<th></th>
</tr>
<% @fetmeetingtops.each do |fetmeetingtop| %>
<tr>
<td><%= fetmeetingtop.title %></td>
<td><%= fetmeetingtop.text %></td>
<td><%= fetmeetingtop.discussion %></td>
<td><%= fetmeetingtop.ersteller %></td>
<td><%= fetmeetingtop.fetmeeting_id %></td>
<td><%= link_to 'Show', fetmeetingtop %></td>
<td><%= link_to 'Edit', edit_fetmeetingtop_path(fetmeetingtop) %></td>
<td><%= link_to 'Destroy', fetmeetingtop, method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<% end %>
</table>
<br />
<%= link_to 'New Fetmeetingtop', new_fetmeetingtop_path %>

5
app/views/fetmeetingtops/new.html.erb Normal file
View File

@@ -0,0 +1,5 @@
<h1>New fetmeetingtop</h1>
<%= render 'form' %>
<%= link_to 'Back', fetmeetingtops_path %>

30
app/views/fetmeetingtops/show.html.erb Normal file
View File

@@ -0,0 +1,30 @@
<p id="notice"><%= notice %></p>
<p>
<b>Title:</b>
<%= @fetmeetingtop.title %>
</p>
<p>
<b>Text:</b>
<%= @fetmeetingtop.text %>
</p>
<p>
<b>Discussion:</b>
<%= @fetmeetingtop.discussion %>
</p>
<p>
<b>Ersteller:</b>
<%= @fetmeetingtop.ersteller %>
</p>
<p>
<b>Fetmeeting:</b>
<%= @fetmeetingtop.fetmeeting_id %>
</p>
<%= link_to 'Edit', edit_fetmeetingtop_path(@fetmeetingtop) %> |
<%= link_to 'Back', fetmeetingtops_path %>

70
app/views/galleries/show.html.erb
View File

@@ -39,45 +39,51 @@
<div style="clear:both"></div>
<div class="fluid-row" style="margin:20px">
<!-- modal-gallery is the modal dialog used for the image gallery -->
<div id="modal-gallery" class="modal hide fade modal-gallery modal-fullscreen modal-loading" tabindex="-1">
<div class="modal-header">
<a class="close" data-dismiss="modal">&times;</a>
<h3 class="modal-title"></h3>
</div>
<div class="modal-body"><div class="modal-image"></div></div>
<div class="modal-footer">
<a class="btn btn-info modal-prev"><i class="icon-arrow-left icon-white"></i></a>
<a class="btn btn-primary modal-next"><i class="icon-arrow-right icon-white"></i></a>
<a class="btn btn-success modal-play modal-slideshow" data-slideshow="5000"><i class="icon-play icon-white"></i> <%=I18n.t('fotos.slideshow')%></a>
<a class="btn modal-download" target="_blank"><i class="icon-download"></i> Download</a>
</div>
</div>
<div id="gallery" data-toggle="modal-gallery" data-target="#modal-gallery">
<!-- The Bootstrap Image Gallery lightbox, should be a child element of the document body -->
<div id="blueimp-gallery" class="blueimp-gallery blueimp-gallery-controls">
<!-- The container for the modal slides -->
<div class="slides"></div>
<!-- Controls for the borderless lightbox -->
<h3 class="title"></h3>
<a class="prev">‹</a>
<a class="next">›</a>
<a class="close">×</a>
<a class="play-pause"></a>
<ol class="indicator"></ol>
<!-- The modal dialog, which will be used to wrap the lightbox content -->
<div class="modal fade">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" aria-hidden="true">&times;</button>
<h4 class="modal-title"></h4>
</div>
<div class="modal-body next"></div>
<div class="modal-footer">
<button type="button" class="btn btn-default pull-left prev">
<i class="glyphicon glyphicon-chevron-left"></i>
Previous
</button>
<button type="button" class="btn btn-primary next">
Next
<i class="glyphicon glyphicon-chevron-right"></i>
</button>
</div>
</div>
</div>
</div>
</div>
<div id="links">
<% @fotos.each_index do |i| %>
<% f= @fotos[i] %>
<a href="<%= f.datei.resized.url%>" title="<%=f.title%>" data-gallery="gallery">
<a href="<%= f.datei.resized.url%>" title="<%=f.title%>" data-gallery>
<%=image_tag(f.datei.thumb.url,{:class=>"img-polaroid img-rounded"}) if @showind.include? i %></a>
<% end %>
</div>
</div>
<%= render 'layouts/pretty_toolbar' %>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
<script src="js/bootstrap.js"></script>
<script src="js/load-image.js"></script>
<script src="js/bootstrap-image-gallery.js"></script>
<script type="text/javascript">
$('#modal-gallery.fade').css('top', '50%');
</script>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script src="//blueimp.github.io/Gallery/js/jquery.blueimp-gallery.min.js"></script>
<script src="js/bootstrap-image-gallery.min.js"></script>
<%= render 'layouts/pretty_toolbar' %>

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

Binary file not shown.