Skip to content

Commit

Permalink
[webui] Style the modals. Fixes #733
Browse files Browse the repository at this point in the history
  • Loading branch information
@hennevogel
hennevogel committed Aug 12, 2014
1 parent f781ed7 commit 8615f7b
Show file tree
Hide file tree
Showing 24 changed files with 413 additions and 489 deletions.
19 changes: 1 addition & 18 deletions src/api/app/assets/stylesheets/webui/application/cm2/toolbars.css
View file
Expand Up @@ -101,21 +101,4 @@ span.CodeMirror-matchhighlight {
margin-left:6px;
background:#f0f0ee;
border:1px solid #b0b0b0;
}


/*Button styling for submit package */
.dialog .buttons {
height:24px;
padding-top:3px;
padding-bottom: 23px;
text-align:center;
background-color:#ddd7c5;
}
.dialog .buttons #remove_dialog {
background-color:#fff;
border-radius: 5px 5px 5px 5px ;
padding: 5px 1ex;
font-size: 1.2em;
}

}
155 changes: 31 additions & 124 deletions src/api/app/assets/stylesheets/webui/application/dialog.css.scss
View file
@@ -1,5 +1,3 @@
/* TODO/FIXME: the images used in url() seem to be missing for a while now */

.dialog {
z-index: 90;
position: fixed;
Expand All @@ -8,131 +6,40 @@
height: 10em;
width: 26em;
margin-left: -13em;
&#disable_mask {
z-index: 89;
top: 0px;
left: 0px;
height: 100%;
margin-top: 0px;
width: 100%;
margin-left: 0px;
background-image: image-url("transparency_grey_20.png");
}
.box_content {
width: 95%;
padding: 2%;
position: absolute;
height: 9em;
border-left: 1px solid #e0e0e0;
border-right: 1px solid #e0e0e0;
text-align: center;
background-color: white;
table {
/* content of dialog box */
width: 100%;
}
td {
height: 6em;
text-align: center;
vertical-align: middle;
}
}
.box_top_row, .box_bottom_row {
background-image: none;
}
.box_middle {
float: left;
width: 94%;
height: 10px;
margin: 0 10px;
background: transparent url(/css/common/images/darkgrey_box/top_middle.png) repeat-x scroll left bottom;
}
.box_bottom_row {
.box_middle {
float: left;
width: 94%;
height: 10px;
margin: 0 10px;
background: transparent url(/css/common/images/darkgrey_box/top_middle.png) repeat-x scroll left bottom;
background: transparent url(/css/common/images/darkgrey_box/bottom_middle_darkgrey.png) repeat-x scroll left bottom;
}
.box_right, .box_left {
position: absolute;
}
}
.box_top_row {
.box_right, .box_left {
position: absolute;
}
.box_right {
position: absolute;
right: auto;
left: 0;
background: transparent url(/css/local/images/darkgrey_box/top_left_corner.png) no-repeat scroll right bottom;
.dialog-content {
overflow: auto;
max-height: 400px;
input:not([type=submit]):not([type=file]) {
width: 95%;
}
}
.box_bottom_row .box_right {
position: absolute;
right: auto;
left: 0;
background: transparent url(/css/local/images/darkgrey_box/top_left_corner.png) no-repeat scroll right bottom;
}
.box_top_row .box_left, .box_bottom_row .box_left {
position: absolute;
right: 0;
left: auto;
background: transparent url(/css/local/images/darkgrey_box/top_right_corner.png) no-repeat scroll right bottom;
}
.box_title_row! .box_title {}
.box_bottom_row {
position: relative;
top: 10em;
}
.box_footer_row {
width: 100%;
}
.box_bottom_row {
.box_left {
background: transparent url(/css/local/images/darkgrey_box/bottom_right_corner.png) no-repeat scroll left top;
}
.box_right {
background: transparent url(/css/local/images/darkgrey_box/bottom_left_corner.png) no-repeat scroll right top;
}
}
input[type="submit"], .buttons a {
padding: 3px 1ex;
/*padding-left: 1ex;*/
margin: 4px;
font-size: 1.2em;
font-weight: bold;
/*
border-top: 2px solid #ddd;
border-left: 2px solid #ddd;
border-right: 2px solid #333;
border-bottom: 2px solid #333;
background: #999;
*/
color: #999;
}
input[type="submit"] {
background: #FFF;
border-color: #FFF;
&:visited {
text-decoration: none;
.dialog-buttons {
text-align: center;
padding-top: 10px;
padding-bottom: 10px;
a, input {
font-size: 1.2em;
padding: 3px 1ex;
background: #FFF;
background-color: #fff;
border-color: #EEE;
color: #999;
&:visited {
text-decoration: none;
}
&:hover {
text-decoration: none;
color: #666;
}
}
#remove_dialog {
border-radius: 5px;
border: 1px solid #eee;
padding: 8px;
/* Make it look like the default option*/
font-weight: bold;
font-size: 1.2em;
}
}
.buttons a:visited {
text-decoration: none;
}
input[type="submit"]:hover, .buttons a:hover {
text-decoration: none;
color: #666;
/*background: #dd77dd;*/
}
input[type="text"] {
width: 95%;
/* same as textarea */
}
}

/* rlihm pfusch */
2 changes: 1 addition & 1 deletion src/api/app/helpers/webui/webui_helper.rb
View file
Expand Up @@ -388,7 +388,7 @@ def setup_codemirror_editor(opts = {})
end

def remove_dialog_tag(text)
link_to(text, '#', title: 'Remove Dialog', id: 'remove_dialog')
link_to(text, '#', title: 'Close', id: 'remove_dialog')
end

# dialog_init is a function name called before dialog is shown
Expand Down
22 changes: 12 additions & 10 deletions src/api/app/views/webui/main/_add_news_dialog.html.erb
View file
Expand Up @@ -2,16 +2,18 @@
<div class="dialog darkgrey_box">
<div class="box box-shadow">
<h2 class="box-header">Add New Message</h2>
<%= form_tag({:controller => 'main', :action => 'add_news'}, :method => 'post') do %>
<p>
<%= label_tag(:message, 'Message:') %><br/>
<%= text_area_tag(:message, '', :size => '40x3') %><br/>
<%= label_tag(:severity, "Severity:") %><br/>
<%= select_tag(:severity, options_for_select([['Information', 0], ['Green', 1], ['Yellow', 2], ['Red', 3]])) %>
</p>
<div class="buttons">
<%= submit_tag('Ok') %>
<%= remove_dialog_tag('Cancel') %>
<div class="dialog-content">
<%= form_tag({:controller => 'main', :action => 'add_news'}, :method => 'post') do %>
<p>
<%= label_tag(:message, 'Message:') %><br/>
<%= text_area_tag(:message, '', :size => '40x3') %><br/>
<%= label_tag(:severity, "Severity:") %><br/>
<%= select_tag(:severity, options_for_select([['Information', 0], ['Green', 1], ['Yellow', 2], ['Red', 3]])) %>
</p>
<div class="dialog-buttons">
<%= submit_tag('Ok') %>
<%= remove_dialog_tag('Cancel') %>
</div>
</div>
<% end %>
</div>
Expand Down
24 changes: 13 additions & 11 deletions src/api/app/views/webui/main/_delete_message_dialog.html.erb
View file
@@ -1,14 +1,16 @@
<div class="dialog" id="disable_mask"></div>
<div class="dialog darkgrey_box">
<div class="box box-shadow">
<h2 class="box-header">Delete Confirmation</h2>
<div class="dialog" id="disable_mask"></div>
<div class="dialog darkgrey_box">
<div class="box box-shadow">
<h2 class="box-header">Delete Confirmation</h2>
<div class="dialog-content">
<p>Really delete this message?</p>
<%= form_tag({:controller => 'main', :action => 'delete_message'}, :method => 'post') do %>
<%= hidden_field_tag(:message_id, params[:message_id]) %>
<div class="buttons">
<%= submit_tag('Ok') %>
<%= remove_dialog_tag('Cancel') %>
</div>
<% end %>
</div>
<%= form_tag({:controller => 'main', :action => 'delete_message'}, :method => 'post') do %>
<%= hidden_field_tag(:message_id, params[:message_id]) %>
<div class="dialog-buttons">
<%= submit_tag('Ok') %>
<%= remove_dialog_tag('Cancel') %>
</div>
<% end %>
</div>
</div>
7 changes: 4 additions & 3 deletions src/api/app/views/webui/package/_branch_dialog.html.erb
View file
Expand Up @@ -2,13 +2,14 @@
<div class="dialog darkgrey_box" id="branch_dialog">
<div class="box box-shadow">
<h2 class="box-header">Branch Confirmation</h2>

<p>Do you really want to branch <%= package_link(@package) %>?</p>
<div class="dialog-content">
<p>Do you really want to branch <%= package_link(@package) %>?</p>
</div>

<%= form_tag({:controller => :package, :action => :branch}, :method => :post) do %>
<%= hidden_field_tag(:project, @project) %>
<%= hidden_field_tag(:package, @package) %>
<div class="buttons">
<div class="dialog-buttons">
<%= submit_tag('Ok') %>
<%= remove_dialog_tag('Cancel') %>
</div>
Expand Down
27 changes: 13 additions & 14 deletions src/api/app/views/webui/package/_delete_dialog.html.erb
View file
@@ -1,18 +1,17 @@
<div class="dialog" id="disable_mask"></div>
<div class="dialog darkgrey_box" id="del_dialog">
<div class="box box-shadow">
<h2 class="box-header">Delete Confirmation</h2>
<div class="dialog" id="disable_mask"></div>
<div class="dialog darkgrey_box" id="del_dialog">
<div class="box box-shadow">
<h2 class="box-header">Delete Confirmation</h2>
<div class="dialog-content">
<p>Do you really want to delete <%= package_link @package %>?</p>

</div>
<%= form_tag({:controller => :package, :action => :remove}, :method => :post) do %>
<div>
<%= hidden_field_tag(:project, @project) %>
<%= hidden_field_tag(:package, @package) %>
<div class="buttons">
<%= submit_tag('Ok') %>
<%= remove_dialog_tag('Cancel') %>
</div>
</div>
<%= hidden_field_tag(:project, @project) %>
<%= hidden_field_tag(:package, @package) %>
<div class="dialog-buttons">
<%= submit_tag('Ok') %>
<%= remove_dialog_tag('Cancel') %>
</div>
<% end %>
</div>
</div>
</div>
26 changes: 14 additions & 12 deletions src/api/app/views/webui/package/_linking_packages.html.erb
View file
@@ -1,18 +1,20 @@
<div class="dialog" id="disable_mask"></div>
<div class="dialog darkgrey_box" id="linking_packages">
<div class="box box-shadow">
<h2 class="box-header">Derived Packages</h2>
<ul>
<% @linking_packages.each do |lp| %>
<% if lp.name != @package.name %>
<% name = elide_two(lp.project.name, lp.name, 46).join(' / ') %>
<% else %>
<% name = elide(lp.project.name, 46) %>
<% end %>
<li><%= link_to(name, :controller => 'package', :action => 'show', :project => lp.project.name, :package => lp.name) %></li>
<% end %>
</ul>
<div class="buttons">
<h2 class="box-header">Derived Packages</span></h2>
<div class="dialog-content">
<ul>
<% @linking_packages.each do |lp| %>
<% if lp.name != @package.name %>
<% name = elide_two(lp.project.name, lp.name, 46).join(' / ') %>
<% else %>
<% name = elide(lp.project.name, 46) %>
<% end %>
<li><%= link_to(name, :controller => 'package', :action => 'show', :project => lp.project.name, :package => lp.name) %></li>
<% end %>
</ul>
</div>
<div class="dialog-buttons">
<%= remove_dialog_tag('Cancel') %>
</div>
</div>
Expand Down
24 changes: 13 additions & 11 deletions src/api/app/views/webui/patchinfo/_delete_dialog.html.erb
View file
Expand Up @@ -2,17 +2,19 @@
<div class="dialog darkgrey_box" id="del_dialog">
<div class="box box-shadow">
<h2 class="box-header">Delete Confirmation</h2>
<p>Do you really want to delete <%= package_link @package %>?</p>

<%= form_tag({:controller => :patchinfo, :action => :remove}, :method => :post) do %>
<div>
<%= hidden_field_tag(:project, @project) %>
<%= hidden_field_tag(:package, @package) %>
<div class="buttons">
<%= submit_tag('Ok') %>
<%= remove_dialog_tag('Cancel') %>
<div class="dialog-content">
<p>Do you really want to delete <%= package_link @package %>?</p>

<%= form_tag({:controller => :patchinfo, :action => :remove}, :method => :post) do %>
<div>
<%= hidden_field_tag(:project, @project) %>
<%= hidden_field_tag(:package, @package) %>
<div class="dialog-buttons">
<%= submit_tag('Ok') %>
<%= remove_dialog_tag('Cancel') %>
</div>
</div>
</div>
<% end %>
<% end %>
</div>
</div>
</div>

0 comments on commit 8615f7b

Please sign in to comment.