Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//
//= require jquery2
//= require jquery_ujs
//= require turbolinks
// require turbolinks
//= require cocoon
//= require main
//= require_tree .
2 changes: 1 addition & 1 deletion app/controllers/admin/abouts_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ def set_admin_about

# Only allow a trusted parameter "white list" through.
def admin_about_params
params.require(:admin_about).permit(:slug, :description,:image)
params.require(:admin_about).permit(:slug, :description,:image, :base64_image)
end
end
2 changes: 1 addition & 1 deletion app/controllers/admin/admission_processes_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ def set_admin_admission_process

# Only allow a trusted parameter "white list" through.
def admin_admission_process_params
params.require(:admin_admission_process).permit(:step, :name, admin_admission_process_images_attributes:[:id,:image,:_destroy,admin_admission_process_image_details_attributes:[:id,:details,:_destroy]])
params.require(:admin_admission_process).permit(:step, :name, admin_admission_process_images_attributes:[:id,:image,:base64_image,:_destroy,admin_admission_process_image_details_attributes:[:id,:details,:_destroy]])
end
end
2 changes: 1 addition & 1 deletion app/controllers/admin/courses_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ def set_admin_course

# Only allow a trusted parameter "white list" through.
def admin_course_params
params.require(:admin_course).permit(:name, :description, :image)
params.require(:admin_course).permit(:name, :description, :image, :base64_image)
end
end
2 changes: 1 addition & 1 deletion app/controllers/admin/mini_sliders_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ def set_admin_mini_slider

# Only allow a trusted parameter "white list" through.
def admin_mini_slider_params
params.require(:admin_mini_slider).permit(:name,:image)
params.require(:admin_mini_slider).permit(:name,:image,:base64_image)
end
end
2 changes: 1 addition & 1 deletion app/controllers/admin/news_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ def set_admin_news

# Only allow a trusted parameter "white list" through.
def admin_news_params
params.require(:admin_news).permit(:name, :description,:image)
params.require(:admin_news).permit(:name, :description,:image, :base64_large_image, :base64_thumb_image)
end
end
2 changes: 1 addition & 1 deletion app/controllers/admin/sliders_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ def set_admin_slider

# Only allow a trusted parameter "white list" through.
def admin_slider_params
params.require(:admin_slider).permit(:name, :caption_1, :caption_2, :image)
params.require(:admin_slider).permit(:name, :caption_1, :caption_2, :image, :base64_image)
end
end
2 changes: 1 addition & 1 deletion app/controllers/admin/testimonials_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ def set_admin_testimonial

# Only allow a trusted parameter "white list" through.
def admin_testimonial_params
params.require(:admin_testimonial).permit(:name, :description, :department_id, :semester_id,:image)
params.require(:admin_testimonial).permit(:name, :description, :department_id, :semester_id,:image, :base64_image)
end
end
2 changes: 1 addition & 1 deletion app/controllers/admin/websites_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ def set_admin_website

# Only allow a trusted parameter "white list" through.
def admin_website_params
params.require(:admin_website).permit(:name, :logo, :favicon, :details)
params.require(:admin_website).permit(:name, :logo, :favicon, :details, :base64_logo, :base64_favicon)
end
end
55 changes: 29 additions & 26 deletions app/views/admin/abouts/_form.html.erb
Original file line number Diff line number Diff line change
@@ -1,33 +1,36 @@
<%= form_for(admin_about) do |f| %>
<% if admin_about.errors.any? %>
<div id="error_explanation">
<h2><%= pluralize(admin_about.errors.count, "error") %> prohibited this admin_about from being saved:</h2>
<% if admin_about.errors.any? %>
<div id="error_explanation">
<h2><%= pluralize(admin_about.errors.count, "error") %> prohibited this admin_about from being saved:</h2>

<ul>
<% admin_about.errors.full_messages.each do |message| %>
<li><%= message %></li>
<% end %>
</ul>
</div>
<% end %>

<div class="field">
<%= f.label :slug %>
<%= f.text_field :slug %>
</div>
<ul>
<% admin_about.errors.full_messages.each do |message| %>
<li><%= message %></li>
<% end %>
</ul>
</div>
<% end %>

<div class="field">
<%= f.label :description %>
<%= f.text_area :description %>
</div>
<div>
<%= f.label :image %>
<%= f.file_field :image %>
<div class="field">
<%= f.label :slug %>
<%= f.text_field :slug %>
</div>

<div class="field">
<%= f.label :description %>
<%= f.text_area :description %>
</div>
<div>
<%= f.label :image %>
<% if Rails.env.development? %>
<%= f.file_field :image %>
<% else %>
<%= f.text_field :base64_image %>
<% end %>

</div>
</div>

<div class="actions">
<%= f.submit %>
</div>
<div class="actions">
<%= f.submit %>
</div>
<% end %>
2 changes: 2 additions & 0 deletions app/views/admin/abouts/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
<tr>
<td><%= admin_about.slug %></td>
<td><%= admin_about.description %></td>
<% if Rails.env.development? %>
<td><%= image_tag admin_about.image.url(:thumb) %></td>
<% end %>
<td><%= link_to 'Show', admin_about %></td>
<td><%= link_to 'Edit', edit_admin_about_path(admin_about) %></td>
<td><%= link_to 'Destroy', admin_about, method: :delete, data: {confirm: 'Are you sure?'} %></td>
Expand Down
3 changes: 2 additions & 1 deletion app/views/admin/abouts/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
<strong>Description:</strong>
<%= @admin_about.description %>
</p>
<% if Rails.env.development? %>
<p>
<strong>Image:</strong>
<%= image_tag @admin_about.image.url(:thumb) %>
</p>

<% end %>
<%= link_to 'Edit', edit_admin_about_path(@admin_about) %> |
<%= link_to 'Back', admin_abouts_path %>
<%= render 'shared/extends_admin_layout' %>
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<div class="nested-fields">
<div class="field">
<%= f.label :image %>
<% if Rails.env.development? %>
<%= f.file_field :image %>
<% else %>
<%= f.text_field :base64_image %>
<% end %>

<div class="field">
<%= f.label :admission_process_image_details %>
Expand Down
13 changes: 8 additions & 5 deletions app/views/admin/admission_processes/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@
<p>
<strong>Name:</strong>
<%= @admin_admission_process.name %>
<% @admin_admission_process.admin_admission_process_images.each do |i|%>
<td><%= image_tag i.image.url(:thumb) %></td>
<% if Rails.env.development? %>
<% @admin_admission_process.admin_admission_process_images.each do |i|%>
<td><%= image_tag i.image.url(:thumb) %></td>
<%end%>
<% end %>

<% @admin_admission_process.admin_admission_process_images.each do|i|%>
<% i.admin_admission_process_image_details.each do |j| %>
<td><%= j.details %></td>
<%end%>
<% i.admin_admission_process_image_details.each do |j| %>
<td><%= j.details %></td>
<%end%>
<%end%>
</p>

Expand Down
48 changes: 26 additions & 22 deletions app/views/admin/courses/_form.html.erb
Original file line number Diff line number Diff line change
@@ -1,30 +1,34 @@
<%= form_for(admin_course) do |f| %>
<% if admin_course.errors.any? %>
<div id="error_explanation">
<h2><%= pluralize(admin_course.errors.count, "error") %> prohibited this admin_course from being saved:</h2>
<% if admin_course.errors.any? %>
<div id="error_explanation">
<h2><%= pluralize(admin_course.errors.count, "error") %> prohibited this admin_course from being saved:</h2>

<ul>
<% admin_course.errors.full_messages.each do |message| %>
<li><%= message %></li>
<% end %>
</ul>
</div>
<% end %>
<ul>
<% admin_course.errors.full_messages.each do |message| %>
<li><%= message %></li>
<% end %>
</ul>
</div>
<% end %>

<div class="field">
<%= f.label :name %>
<%= f.text_field :name %>
</div>
<div class="field">
<%= f.label :name %>
<%= f.text_field :name %>
</div>

<div class="field">
<%= f.label :description %>
<%= f.text_area :description %>
</div>
<div class="field">
<%= f.label :description %>
<%= f.text_area :description %>
</div>
<div class="field">
<%= f.label :image %>
<%= f.file_field :image %>
<% if Rails.env.development? %>
<%= f.file_field :image %>
<% else %>
<%= f.text_field :base64_image %>
<% end %>
</div>
<div class="actions">
<%= f.submit %>
</div>
<div class="actions">
<%= f.submit %>
</div>
<% end %>
2 changes: 2 additions & 0 deletions app/views/admin/courses/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
<td><%= admin_course.name %></td>
<td><%= admin_course.description %></td>

<% if Rails.env.development? %>
<td><%= image_tag admin_course.image.url(:thumb) %></td>
<% end %>
<td><%= link_to 'Show', admin_course %></td>
<td><%= link_to 'Edit', edit_admin_course_path(admin_course) %></td>
<td><%= link_to 'Destroy', admin_course, method: :delete, data: { confirm: 'Are you sure?' } %></td>
Expand Down
3 changes: 2 additions & 1 deletion app/views/admin/courses/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
</p>
<strong>Description:</strong>
<%= @admin_course.description %>
<% if Rails.env.development? %>
<p>
<strong>Image:</strong>
<%= image_tag @admin_course.image.url(:thumb) %>
</p>

<% end %>
<%= link_to 'Edit', edit_admin_course_path(@admin_course) %> |
<%= link_to 'Back', admin_courses_path %>
<%= render 'shared/extends_admin_layout' %>
40 changes: 22 additions & 18 deletions app/views/admin/mini_sliders/_form.html.erb
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
<%= form_for(admin_mini_slider) do |f| %>
<% if admin_mini_slider.errors.any? %>
<div id="error_explanation">
<h2><%= pluralize(admin_mini_slider.errors.count, "error") %> prohibited this admin_mini_slider from being saved:</h2>
<% if admin_mini_slider.errors.any? %>
<div id="error_explanation">
<h2><%= pluralize(admin_mini_slider.errors.count, "error") %> prohibited this admin_mini_slider from being saved:</h2>

<ul>
<% admin_mini_slider.errors.full_messages.each do |message| %>
<li><%= message %></li>
<% end %>
</ul>
</div>
<% end %>
<ul>
<% admin_mini_slider.errors.full_messages.each do |message| %>
<li><%= message %></li>
<% end %>
</ul>
</div>
<% end %>

<div class="field">
<%= f.label :name %>
<%= f.text_field :name %>
</div>
<div class="field">
<%= f.label :name %>
<%= f.text_field :name %>
</div>

<div class="field">
<%= f.label :image %>
<%= f.file_field :image %>
<% if Rails.env.development? %>
<%= f.file_field :image %>
<% else %>
<%= f.text_field :base64_image %>
<% end %>
</div>
<div class="actions">
<%= f.submit %>
</div>
<div class="actions">
<%= f.submit %>
</div>
<% end %>
2 changes: 2 additions & 0 deletions app/views/admin/mini_sliders/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
<% @admin_mini_sliders.each do |admin_mini_slider| %>
<tr>
<td><%= admin_mini_slider.name %></td>
<% if Rails.env.development? %>
<td><%= image_tag admin_mini_slider.image.url(:thumb) %></td>
<% end %>
<td><%= link_to 'Show', admin_mini_slider %></td>
<td><%= link_to 'Edit', edit_admin_mini_slider_path(admin_mini_slider) %></td>
<td><%= link_to 'Destroy', admin_mini_slider, method: :delete, data: { confirm: 'Are you sure?' } %></td>
Expand Down
4 changes: 3 additions & 1 deletion app/views/admin/mini_sliders/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
<p>
<strong>Name:</strong>
<%= @admin_mini_slider.name %>
<%= image_tag @admin_mini_slider.image.url(:thumb) %>
<% if Rails.env.development? %>
<%= image_tag @admin_mini_slider.image.url(:thumb) %>
<% end %>
</p>

<%= link_to 'Edit', edit_admin_mini_slider_path(@admin_mini_slider) %> |
Expand Down
5 changes: 5 additions & 0 deletions app/views/admin/news/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@
</div>
<div class="field">
<%= f.label :image %>
<% if Rails.env.development? %>
<%= f.file_field :image %>
<% else %>
large: <%= f.text_field :base64_large_image %>
thumb: <%= f.text_field :base64_thumb_image %>
<% end %>
</div>

<div class="actions">
Expand Down
2 changes: 2 additions & 0 deletions app/views/admin/news/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
<tr>
<td><%= admin_news.name %></td>
<td><%= admin_news.description %></td>
<% if Rails.env.development? %>
<td><%= image_tag admin_news.image.url(:thumb) %></td>
<% end %>
<td><%= link_to 'Show', admin_news %></td>
<td><%= link_to 'Edit', edit_admin_news_path(admin_news) %></td>
<td><%= link_to 'Destroy', admin_news, method: :delete, data: { confirm: 'Are you sure?' } %></td>
Expand Down
3 changes: 2 additions & 1 deletion app/views/admin/news/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
<strong>Description:</strong>
<%= @admin_news.description %>
</p>
<% if Rails.env.development? %>
<p>
<strong>Thumbs</strong>
<%= image_tag @admin_news.image.url(:thumb) %>
</p>

<% end %>
<%= link_to 'Edit', edit_admin_news_path(@admin_news) %> |
<%= link_to 'Back', admin_news_index_path %>
<%= render 'shared/extends_admin_layout' %>
4 changes: 4 additions & 0 deletions app/views/admin/sliders/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@
</div>
<div class="field">
<%= f.label :image%>
<% if Rails.env.development? %>
<%= f.file_field :image %>
<% else %>
<%= f.text_field :base64_image %>
<% end %>
</div>
<div class="field">
<%= f.label :caption_1 %>
Expand Down
Loading