| @@ -25,7 +25,7 @@ class Admins::SystemNotificationsController < Admins::BaseController | |||||
| @notification = SystemNotification.new(notification_params) | @notification = SystemNotification.new(notification_params) | ||||
| if @notification.save | if @notification.save | ||||
| redirect_to admins_system_notifications_path | redirect_to admins_system_notifications_path | ||||
| flash[:success] = '系统消息创建成功' | |||||
| flash[:success] = '系统公告创建成功' | |||||
| else | else | ||||
| redirect_to admins_system_notifications_path | redirect_to admins_system_notifications_path | ||||
| flash[:danger] = @notification.errors.full_messages.join(",") | flash[:danger] = @notification.errors.full_messages.join(",") | ||||
| @@ -37,7 +37,7 @@ class Admins::SystemNotificationsController < Admins::BaseController | |||||
| if @notification.update_attributes(notification_params) | if @notification.update_attributes(notification_params) | ||||
| format.html do | format.html do | ||||
| redirect_to admins_system_notifications_path | redirect_to admins_system_notifications_path | ||||
| flash[:success] = '系统消息更新成功' | |||||
| flash[:success] = '系统公告更新成功' | |||||
| end | end | ||||
| format.js {render_ok} | format.js {render_ok} | ||||
| else | else | ||||
| @@ -53,10 +53,10 @@ class Admins::SystemNotificationsController < Admins::BaseController | |||||
| def destroy | def destroy | ||||
| if @notification.destroy | if @notification.destroy | ||||
| redirect_to admins_system_notifications_path | redirect_to admins_system_notifications_path | ||||
| flash[:success] = "系统消息删除成功" | |||||
| flash[:success] = "系统公告删除成功" | |||||
| else | else | ||||
| redirect_to admins_system_notifications_path | redirect_to admins_system_notifications_path | ||||
| flash[:danger] = "系统消息删除失败" | |||||
| flash[:danger] = "系统公告删除失败" | |||||
| end | end | ||||
| end | end | ||||
| @@ -1,6 +1,6 @@ | |||||
| <% | <% | ||||
| define_admin_breadcrumbs do | define_admin_breadcrumbs do | ||||
| add_admin_breadcrumb('云上实验室', admins_laboratories_path) | |||||
| add_admin_breadcrumb('导航栏配置', admins_laboratories_path) | |||||
| add_admin_breadcrumb('轮播图') | add_admin_breadcrumb('轮播图') | ||||
| end | end | ||||
| %> | %> | ||||
| @@ -1,5 +1,5 @@ | |||||
| <% define_admin_breadcrumbs do %> | <% define_admin_breadcrumbs do %> | ||||
| <% add_admin_breadcrumb('云上实验室') %> | |||||
| <% add_admin_breadcrumb('导航栏配置') %> | |||||
| <% end %> | <% end %> | ||||
| <div class="box search-form-container laboratory-list-form"> | <div class="box search-form-container laboratory-list-form"> | ||||
| @@ -2,7 +2,7 @@ | |||||
| <div class="modal-dialog modal-dialog-centered" role="document"> | <div class="modal-dialog modal-dialog-centered" role="document"> | ||||
| <div class="modal-content"> | <div class="modal-content"> | ||||
| <div class="modal-header"> | <div class="modal-header"> | ||||
| <h5 class="modal-title">新建云上实验室</h5> | |||||
| <h5 class="modal-title">新建导航栏配置</h5> | |||||
| <button type="button" class="close" data-dismiss="modal" aria-label="Close"> | <button type="button" class="close" data-dismiss="modal" aria-label="Close"> | ||||
| <span aria-hidden="true">×</span> | <span aria-hidden="true">×</span> | ||||
| </button> | </button> | ||||
| @@ -1,5 +1,5 @@ | |||||
| <% define_admin_breadcrumbs do %> | <% define_admin_breadcrumbs do %> | ||||
| <% add_admin_breadcrumb('云上实验室', admins_laboratories_path) %> | |||||
| <% add_admin_breadcrumb('导航栏配置', admins_laboratories_path) %> | |||||
| <% add_admin_breadcrumb('单位定制') %> | <% add_admin_breadcrumb('单位定制') %> | ||||
| <% end %> | <% end %> | ||||
| @@ -11,13 +11,13 @@ | |||||
| <div class="modal-body"> | <div class="modal-body"> | ||||
| <div class="form-group"> | <div class="form-group"> | ||||
| <label> | <label> | ||||
| 系统保留关键词标识 <span class="ml10 color-orange mr20">*</span> | |||||
| 禁用词标识 <span class="ml10 color-orange mr20">*</span> | |||||
| </label> | </label> | ||||
| <%= p.text_field :identifier,class: "form-control input-lg",required: true%> | <%= p.text_field :identifier,class: "form-control input-lg",required: true%> | ||||
| </div> | </div> | ||||
| <div class="form-group"> | <div class="form-group"> | ||||
| <label> | <label> | ||||
| 系统保留关键词描述 | |||||
| 禁用词描述 | |||||
| </label> | </label> | ||||
| <%= p.text_area :description,class: "form-control",placeholder: ""%> | <%= p.text_area :description,class: "form-control",placeholder: ""%> | ||||
| </div> | </div> | ||||
| @@ -1,5 +1,5 @@ | |||||
| <% define_admin_breadcrumbs do %> | <% define_admin_breadcrumbs do %> | ||||
| <% add_admin_breadcrumb('系统保留关键词') %> | |||||
| <% add_admin_breadcrumb('禁用词管理') %> | |||||
| <% end %> | <% end %> | ||||
| <div class="box search-form-container project-list-form"> | <div class="box search-form-container project-list-form"> | ||||
| @@ -1,5 +1,5 @@ | |||||
| <div class="box search-form-container project-list-form"> | <div class="box search-form-container project-list-form"> | ||||
| <div style="line-height: 38px;" class="flex-1"><%= type == "create" ? "新建" : "编辑" %>系统通知</div> | |||||
| <div style="line-height: 38px;" class="flex-1"><%= type == "create" ? "新建" : "编辑" %>系统公告</div> | |||||
| <%= link_to "返回", admins_system_notifications_path, class: "btn btn-default pull-right" %> | <%= link_to "返回", admins_system_notifications_path, class: "btn btn-default pull-right" %> | ||||
| </div> | </div> | ||||
| @@ -8,36 +8,36 @@ | |||||
| <div class="form-group"> | <div class="form-group"> | ||||
| <label> | <label> | ||||
| <span class="color-grey-6 pt10"> | <span class="color-grey-6 pt10"> | ||||
| 系统通知标题 | |||||
| 系统公告标题 | |||||
| <span class="ml10 color-orange mr20">*</span> | <span class="ml10 color-orange mr20">*</span> | ||||
| </span> | </span> | ||||
| </label> | </label> | ||||
| <div class="mt-10"> | <div class="mt-10"> | ||||
| <%= p.text_field :subject, class: "form-control input-lg", placeholder: "请输入系统通知标题" %> | |||||
| <%= p.text_field :subject, class: "form-control input-lg", placeholder: "请输入系统公告标题" %> | |||||
| </div> | </div> | ||||
| </div> | </div> | ||||
| <div class="form-group"> | <div class="form-group"> | ||||
| <label> | <label> | ||||
| <span class="color-grey-6 pt10"> | <span class="color-grey-6 pt10"> | ||||
| 系统通知副标题 | |||||
| 系统公告副标题 | |||||
| <span class="ml10 color-orange mr20">*</span> | <span class="ml10 color-orange mr20">*</span> | ||||
| </span> | </span> | ||||
| </label> | </label> | ||||
| <div class="mt-10"> | <div class="mt-10"> | ||||
| <%= p.text_field :sub_subject, class: "form-control input-lg", placeholder: "请输入系统通知副标题" %> | |||||
| <%= p.text_field :sub_subject, class: "form-control input-lg", placeholder: "请输入系统公告副标题" %> | |||||
| </div> | </div> | ||||
| </div> | </div> | ||||
| <div class="form-group"> | <div class="form-group"> | ||||
| <label> | <label> | ||||
| <span class="color-grey-6 pt10"> | <span class="color-grey-6 pt10"> | ||||
| 系统通知正文 | |||||
| 系统公告正文 | |||||
| <span class="ml10 color-orange mr20">*</span> | <span class="ml10 color-orange mr20">*</span> | ||||
| </span> | </span> | ||||
| </label> | </label> | ||||
| <div class="pl-0 my-3 setting-item-body" id="system-notification-content-editor"> | <div class="pl-0 my-3 setting-item-body" id="system-notification-content-editor"> | ||||
| <%= p.text_area :content, class:"form-control", style: 'display: none;', rows: "10", cols: "20", placeholer: "请输入系统通知正文" %> | |||||
| <%= p.text_area :content, class:"form-control", style: 'display: none;', rows: "10", cols: "20", placeholer: "请输入系统公告正文" %> | |||||
| </div> | </div> | ||||
| </div> | </div> | ||||
| @@ -1,11 +1,11 @@ | |||||
| <% define_admin_breadcrumbs do %> | <% define_admin_breadcrumbs do %> | ||||
| <% add_admin_breadcrumb('系统通知模版') %> | |||||
| <% add_admin_breadcrumb('系统公告配置') %> | |||||
| <% end %> | <% end %> | ||||
| <div id="admins-system-notification-content"> | <div id="admins-system-notification-content"> | ||||
| <div class="box search-form-container project-list-form"> | <div class="box search-form-container project-list-form"> | ||||
| <%= form_tag(admins_system_notifications_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %> | <%= form_tag(admins_system_notifications_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %> | ||||
| <%= text_field_tag(:search, params[:search], class: 'form-control col-12 col-md-2 mr-3', placeholder: '系统通知标题检索') %> | |||||
| <%= text_field_tag(:search, params[:search], class: 'form-control col-12 col-md-2 mr-3', placeholder: '系统公告标题检索') %> | |||||
| <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %> | <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %> | ||||
| <input type="reset" class="btn btn-secondary clear-btn" value="清空"/> | <input type="reset" class="btn btn-secondary clear-btn" value="清空"/> | ||||
| <% end %> | <% end %> | ||||