Welcome to <%= @about.slug %>
-<%= image_tag @about.image.url(:large) %>
+ <% if Rails.env.development? %> +<%= image_tag @about.image.url(:large) %>
+ <% else %> +diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index a78fdfa..5eab23a 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,7 +12,7 @@ // //= require jquery2 //= require jquery_ujs -//= require turbolinks +// require turbolinks //= require cocoon //= require main //= require_tree . diff --git a/app/controllers/admin/abouts_controller.rb b/app/controllers/admin/abouts_controller.rb index c63027d..d49be09 100644 --- a/app/controllers/admin/abouts_controller.rb +++ b/app/controllers/admin/abouts_controller.rb @@ -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 diff --git a/app/controllers/admin/admission_processes_controller.rb b/app/controllers/admin/admission_processes_controller.rb index e6c2fe5..f9d8112 100644 --- a/app/controllers/admin/admission_processes_controller.rb +++ b/app/controllers/admin/admission_processes_controller.rb @@ -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 diff --git a/app/controllers/admin/courses_controller.rb b/app/controllers/admin/courses_controller.rb index de2ac18..63d9fe2 100644 --- a/app/controllers/admin/courses_controller.rb +++ b/app/controllers/admin/courses_controller.rb @@ -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 diff --git a/app/controllers/admin/mini_sliders_controller.rb b/app/controllers/admin/mini_sliders_controller.rb index b1e672a..b416732 100644 --- a/app/controllers/admin/mini_sliders_controller.rb +++ b/app/controllers/admin/mini_sliders_controller.rb @@ -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 diff --git a/app/controllers/admin/news_controller.rb b/app/controllers/admin/news_controller.rb index 2cb77ed..f3713c8 100644 --- a/app/controllers/admin/news_controller.rb +++ b/app/controllers/admin/news_controller.rb @@ -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 diff --git a/app/controllers/admin/sliders_controller.rb b/app/controllers/admin/sliders_controller.rb index 3d63ab0..9e239c6 100644 --- a/app/controllers/admin/sliders_controller.rb +++ b/app/controllers/admin/sliders_controller.rb @@ -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 diff --git a/app/controllers/admin/testimonials_controller.rb b/app/controllers/admin/testimonials_controller.rb index 43b54f8..6715b1f 100644 --- a/app/controllers/admin/testimonials_controller.rb +++ b/app/controllers/admin/testimonials_controller.rb @@ -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 diff --git a/app/controllers/admin/websites_controller.rb b/app/controllers/admin/websites_controller.rb index 7428090..e8cce6a 100644 --- a/app/controllers/admin/websites_controller.rb +++ b/app/controllers/admin/websites_controller.rb @@ -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 diff --git a/app/views/admin/abouts/_form.html.erb b/app/views/admin/abouts/_form.html.erb index 71fc503..dd3a6c0 100644 --- a/app/views/admin/abouts/_form.html.erb +++ b/app/views/admin/abouts/_form.html.erb @@ -1,33 +1,36 @@ <%= form_for(admin_about) do |f| %> - <% if admin_about.errors.any? %> -
Image: <%= image_tag @admin_about.image.url(:thumb) %>
- +<% end %> <%= link_to 'Edit', edit_admin_about_path(@admin_about) %> | <%= link_to 'Back', admin_abouts_path %> <%= render 'shared/extends_admin_layout' %> diff --git a/app/views/admin/admission_processes/_admin_admission_process_image_fields.html.erb b/app/views/admin/admission_processes/_admin_admission_process_image_fields.html.erb index 6e07458..f7c0b6b 100644 --- a/app/views/admin/admission_processes/_admin_admission_process_image_fields.html.erb +++ b/app/views/admin/admission_processes/_admin_admission_process_image_fields.html.erb @@ -1,7 +1,11 @@Name: <%= @admin_admission_process.name %> -<% @admin_admission_process.admin_admission_process_images.each do |i|%> -
Image: <%= image_tag @admin_course.image.url(:thumb) %>
- +<% end %> <%= link_to 'Edit', edit_admin_course_path(@admin_course) %> | <%= link_to 'Back', admin_courses_path %> <%= render 'shared/extends_admin_layout' %> diff --git a/app/views/admin/mini_sliders/_form.html.erb b/app/views/admin/mini_sliders/_form.html.erb index 6cbee42..ee01748 100644 --- a/app/views/admin/mini_sliders/_form.html.erb +++ b/app/views/admin/mini_sliders/_form.html.erb @@ -1,26 +1,30 @@ <%= form_for(admin_mini_slider) do |f| %> - <% if admin_mini_slider.errors.any? %> -Name: <%= @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 %>
<%= link_to 'Edit', edit_admin_mini_slider_path(@admin_mini_slider) %> | diff --git a/app/views/admin/news/_form.html.erb b/app/views/admin/news/_form.html.erb index ca19c69..e0eaadc 100644 --- a/app/views/admin/news/_form.html.erb +++ b/app/views/admin/news/_form.html.erb @@ -22,7 +22,12 @@Thumbs <%= image_tag @admin_news.image.url(:thumb) %>
- +<% end %> <%= link_to 'Edit', edit_admin_news_path(@admin_news) %> | <%= link_to 'Back', admin_news_index_path %> <%= render 'shared/extends_admin_layout' %> diff --git a/app/views/admin/sliders/_form.html.erb b/app/views/admin/sliders/_form.html.erb index ff0e5ae..5f65d4a 100644 --- a/app/views/admin/sliders/_form.html.erb +++ b/app/views/admin/sliders/_form.html.erb @@ -17,7 +17,11 @@Name: <%= @admin_slider.name %> -
- Image - <%= image_tag @admin_slider.image.url(:thumb) %> -
+ + <% if Rails.env.development? %> ++ Image + <%= image_tag @admin_slider.image.url(:thumb) %> +
+<% end %>Caption 1: <%= @admin_slider.caption_1 %> diff --git a/app/views/admin/testimonials/_form.html.erb b/app/views/admin/testimonials/_form.html.erb index 827b9e7..4b422ac 100644 --- a/app/views/admin/testimonials/_form.html.erb +++ b/app/views/admin/testimonials/_form.html.erb @@ -32,7 +32,11 @@
<%= image_tag @about.image.url(:large) %>
+ <% if Rails.env.development? %> +<%= image_tag @about.image.url(:large) %>
+ <% else %> +<%= image_tag @course.image.url(:large), class: 'fix800 img-responsive' %>
+ <% else %> +<%= @course.description.html_safe %>
<%= event.details %>
+<%= event.details.html_safe %>
<% end %> diff --git a/app/views/frontend/home.html.erb b/app/views/frontend/home.html.erb index fd1fb93..383c95b 100644 --- a/app/views/frontend/home.html.erb +++ b/app/views/frontend/home.html.erb @@ -5,7 +5,11 @@
<%= slider.caption_1 %>
@@ -44,7 +48,11 @@
<%= truncate_html news.description, length: 163 %>
Read more @@ -56,7 +64,11 @@<%= truncate_html news.description, length: 163 %>
Read more diff --git a/app/views/frontend/how_to_apply.html.erb b/app/views/frontend/how_to_apply.html.erb index 03193e8..1bea862 100644 --- a/app/views/frontend/how_to_apply.html.erb +++ b/app/views/frontend/how_to_apply.html.erb @@ -7,7 +7,11 @@ <% admission_process.admin_admission_process_images.each do |process_image| %><%= image_tag process_image.image.url(:large), class: 'img-responsive' %>
+ <% else %> +<%= image_tag @news.image.url(:large), class: 'img-responsive' %>
+ <% else %> +-<%= testimonial.description %>
+<%= testimonial.description.html_safe %>
<%= testimonial.name %>
Student(<%= testimonial.department.short_form %>-<%= testimonial.semester.short_form %>)