scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-12-17 14:19:05 +08:00
Code Issues Projects Releases Packages Wiki Activity

change html structure for flash msg, change columns buttons

Browse source
This commit is contained in:
Mojca Lorber 2020-01-20 14:02:42 +01:00
parent 8b635ac38a
commit 772118d246
3 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/my_modules/repository.html.erb
View file

@ -18,7 +18,7 @@
</div> </div>
<div class="repo-datatables-buttons pull-right" style="display: inline;"> <div class="repo-datatables-buttons pull-right" style="display: inline;">
<button class="btn btn-primary help_tooltips manage-repo-column-index" <button class="btn btn-secondary help_tooltips manage-repo-column-index"
data-modal-url="<%= repository_columns_index_html_path(@repository) %>" data-modal-url="<%= repository_columns_index_html_path(@repository) %>"
data-action="new" data-action="new"
data-tooltiplink="<%= I18n.t('tooltips.link.inventory.manage_columns') %>" data-tooltiplink="<%= I18n.t('tooltips.link.inventory.manage_columns') %>"

2
app/views/repositories/show.html.erb
View file

@ -44,7 +44,7 @@
<% end %> <% end %>
</div> </div>
<button class="btn btn-primary help_tooltips manage-repo-column-index" <button class="btn btn-secondary help_tooltips manage-repo-column-index"
data-modal-url="<%= repository_columns_index_html_path(@repository) %>" data-modal-url="<%= repository_columns_index_html_path(@repository) %>"
data-action="new" data-action="new"
data-tooltiplink="<%= I18n.t('tooltips.link.inventory.manage_columns') %>" data-tooltiplink="<%= I18n.t('tooltips.link.inventory.manage_columns') %>"

18
app/views/shared/_flash_alerts.html.erb
View file

@ -1,29 +1,23 @@
<div id="notifications"> <div id="notifications">
<% if flash[:success] %> <% if flash[:success] %>
<div id="alert-flash" class="alert alert-success alert-dismissable alert-floating"> <div id="alert-flash" class="alert alert-success alert-dismissable alert-floating">
<div>
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
<span class="fas fa-check-circle"></span> <span class="fas fa-check-circle"></span>
<span><%= sanitize_input(flash[:success]) %></span> <span class="message"><%= sanitize_input(flash[:success]) %></span>
</div> <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
</div> </div>
<% end %> <% end %>
<% if notice %> <% if notice %>
<div id="alert-flash" class="alert alert-info alert-dismissable alert-floating"> <div id="alert-flash" class="alert alert-info alert-dismissable alert-floating">
<div>
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
<span class="fas fa-info-circle"></span> <span class="fas fa-info-circle"></span>
<span><%= notice %></span> <span class="message"><%= notice %></span>
</div> <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
</div> </div>
<% end %> <% end %>
<% if alert and !alert.empty? or flash[:error]%> <% if alert and !alert.empty? or flash[:error]%>
<div id="alert-flash" class="alert alert-danger alert-dismissable alert-floating"> <div id="alert-flash" class="alert alert-danger alert-dismissable alert-floating">
<div>
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
<span class="fas fa-exclamation-circle"></span> <span class="fas fa-exclamation-circle"></span>
<span><%= alert || sanitize_input(flash[:error]) %></span> <span class="message"><%= alert || sanitize_input(flash[:error]) %></span>
</div> <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
</div> </div>
<% end %> <% end %>
</div> </div>