Skip to content
Snippets Groups Projects
Commit b743d32a authored by pabois's avatar pabois
Browse files

Merge branch 'master' of github.com:noesya/osuny

parents fd41ec88 0d3580fb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/assets/stylesheets/admin/appstack.sass
+ 4
− 0
View file @ b743d32a
......@@ -16,3 +16,7 @@ main.content
table.table-striped
tbody
background: white
.card-footer
.pagination
margin-bottom: 0
app/views/admin/application/_top.html.erb
+ 1
− 1
View file @ b743d32a
......@@ -18,7 +18,7 @@
<li>
<a class="nav-link nav-link--last js-user-button" href="#">
<% if current_user.picture.attached? && current_user.picture.variable? %>
<%= image_tag current_user.picture.variant(resize: '40x40'), class: 'avatar img-fluid rounded-circle' %>
<%= image_tag current_user.picture.variant(resize: '80x80'), class: 'avatar img-fluid rounded-circle' %>
<% else %>
<%= image_tag 'avatar.jpg', class: 'avatar img-fluid rounded-circle' %>
<% end %>
......
app/views/admin/communication/websites/import.html.erb
+ 56
− 38
View file @ b743d32a
......@@ -6,46 +6,64 @@
class: button_classes %>
<% end %>
<h2><%= @imported_posts.count %> posts</h2>
<table class="<%= table_classes %>">
<thead>
<tr>
<th><%= Communication::Website::Imported::Post.human_attribute_name('title') %></th>
<th><%= Communication::Website::Imported::Post.human_attribute_name('original') %></th>
<th></th>
</tr>
</thead>
<tbody>
<% @imported_posts.each do |post| %>
<div class="card">
<div class="card-header">
<h2><%= @imported_posts.count %> posts</h2>
</div>
<table class="<%= table_classes %>">
<thead>
<tr>
<td><%= link_to post, admin_communication_website_post_path(website_id: post.post.website.id, id: post.post.id) %></td>
<td class="small"><%= link_to post.path, post.url, target: :_blank %></td>
<td>
<%= link_to t('show'),
admin_communication_website_post_path(website_id: post.post.website.id, id: post.post.id),
class: button_classes %>
</td>
<th><%= Communication::Website::Imported::Post.human_attribute_name('title') %></th>
<th><%= Communication::Website::Imported::Post.human_attribute_name('original') %></th>
<th class="text-end" width="150">Generated post</th>
</tr>
<% end %>
</tbody>
</table>
<%= paginate @imported_posts, param_name: :posts_page, theme: 'bootstrap-5' %>
</thead>
<tbody>
<% @imported_posts.each do |post| %>
<tr>
<td><%= post %></td>
<td class="small"><%= link_to post.path, post.url, target: :_blank %></td>
<td class="text-end">
<%= link_to t('show'),
admin_communication_website_post_path(website_id: post.post.website.id, id: post.post.id),
class: button_classes %>
</td>
</tr>
<% end %>
</tbody>
</table>
<div class="card-footer">
<%= paginate @imported_posts, param_name: :posts_page, theme: 'bootstrap-5' %>
</div>
</div>
<h2 class="mt-5"><%= @imported_pages.count %> pages</h2>
<table class="<%= table_classes %>">
<thead>
<tr>
<th class="ps-0"><%= Communication::Website::Imported::Page.human_attribute_name('title') %></th>
<th><%= Communication::Website::Imported::Page.human_attribute_name('original') %></th>
</tr>
</thead>
<tbody>
<% @imported_pages.each do |page| %>
<div class="card mt-5">
<div class="card-header">
<h2><%= @imported_pages.count %> pages</h2>
</div>
<table class="<%= table_classes %>">
<thead>
<tr>
<td><%= link_to page, admin_communication_website_page_path(website_id: page.page.website.id, id: page.page.id) %></td>
<td class="small"><%= link_to page.path, page.url, target: :_blank %></td>
<th><%= Communication::Website::Imported::Page.human_attribute_name('title') %></th>
<th><%= Communication::Website::Imported::Page.human_attribute_name('original') %></th>
<th class="text-end" width="150">Generated page</th>
</tr>
<% end %>
</tbody>
</table>
<%= paginate @imported_pages, param_name: :pages_page, theme: 'bootstrap-5' %>
</thead>
<tbody>
<% @imported_pages.each do |page| %>
<tr>
<td><%= page %></td>
<td class="small"><%= link_to page.path, page.url, target: :_blank %></td>
<td class="text-end">
<%= link_to t('show'),
admin_communication_website_page_path(website_id: page.page.website.id, id: page.page.id),
class: button_classes %>
</td>
</tr>
<% end %>
</tbody>
</table>
<div class="card-footer">
<%= paginate @imported_pages, param_name: :pages_page, theme: 'bootstrap-5' %>
</div>
</div>
app/views/server/universities/show.html.erb
+ 30
− 31
View file @ b743d32a
<% content_for :title, @university %>
<div class="row">
<div class="col-md-9">
<p>
<%= link_to @university.url, @university.url, target: :_blank %>
</p>
<p>
<strong><%= University.human_attribute_name('address') %>:</strong>
<%= @university.address %>
</p>
<p>
<strong><%= University.human_attribute_name('zipcode') %>:</strong>
<%= @university.zipcode %>
</p>
<p>
<strong><%= University.human_attribute_name('city') %>:</strong>
<%= @university.city %>
</p>
<p>
<strong><%= University.human_attribute_name('country') %>:</strong>
<%= @university.country %>
</p>
<p>
<strong><%= University.human_attribute_name('private') %>:</strong>
<%= @university.private %>
</p>
<div class="col-md-5">
<div class="card">
<div class="card-header">
<h2 class="card-title">Infos</h2>
</div>
<table class="table">
<tr>
<td>URL</td>
<td class="text-end"><%= link_to @university.url, @university.url, target: :_blank %></td>
</tr>
<% ['address', 'zipcode', 'city', 'country'].each do |variable| %>
<tr>
<td><%= University.human_attribute_name(variable) %></td>
<td class="text-end"><%= @university.send variable %></td>
</tr>
<% end %>
<tr>
<td><%= University.human_attribute_name('private') %></td>
<td class="text-end"><%= @university.private %></td>
</tr>
</table>
</div>
</div>
<div class="col-md-3">
<%= kamifusen_tag @university.logo, class: 'img-fluid' %>
<div class="card">
<div class="card-header">
<h2 class="card-title">Logo</h2>
</div>
<div class="card-body">
<%= kamifusen_tag @university.logo, class: 'img-fluid p-5' %>
</div>
</div>
</div>
</div>
<% content_for :action_bar_right do %>
<%= link_to t('edit'), edit_server_university_path(@university), class: button_classes %>
<% end %>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment