Diff
Modified: branches/datasets/app/views/data_items/_data_item.rhtml (2886 => 2887)
--- branches/datasets/app/views/data_items/_data_item.rhtml 2011-12-21 10:32:07 UTC (rev 2886)
+++ branches/datasets/app/views/data_items/_data_item.rhtml 2011-12-21 11:04:38 UTC (rev 2887)
@@ -1,16 +1,20 @@
<% port_td = capture do %>
- <td class="port <%= data_item.port_type -%>">
- <h5><img src="" <%= data_item.port_type.capitalize %> Name</h5>
- <div>
- <input title="<%= data_item.port_name -%>" type="text" readonly="readonly" value="<%= data_item.port_name -%>" size="24" class="readonly"/>
+ <td>
+ <div class="port <%= data_item.port_type -%>">
+ <h5><img src="" <%= data_item.port_type.capitalize %> Name:</h5>
+ <div>
+ <input title="<%= data_item.port_name -%>" type="text" readonly="readonly" value="<%= data_item.port_name -%>" size="24" class="readonly"/>
+ </div>
</div>
</td>
<% end %>
<% data_td = capture do %>
- <td class="data">
- <h5><img src="" Data</h5>
- <%= render :partial => "data_items/data_types/#{data_item.data_type.underscore}/data", :object => data_item.data %>
+ <td>
+ <div class="data">
+ <h5><img src="" Data:</h5>
+ <%= render :partial => "data_items/data_types/#{data_item.data_type.underscore}/data", :object => data_item.data %>
+ </div>
</td>
<% end %>
Modified: branches/datasets/app/views/data_items/_data_item_form.rhtml (2886 => 2887)
--- branches/datasets/app/views/data_items/_data_item_form.rhtml 2011-12-21 10:32:07 UTC (rev 2886)
+++ branches/datasets/app/views/data_items/_data_item_form.rhtml 2011-12-21 11:04:38 UTC (rev 2887)
@@ -52,32 +52,36 @@
<td colspan="4" style="padding: 0">
<% port_td = capture do %>
- <td class="port <%= port_type -%>" style="vertical-align: top">
- <h5>Select <%= port_type %></h5>
- <div>
- <%= select_tag(:workflow_port, port_names_for_select) %>
+ <td>
+ <div class="port <%= port_type -%>" style="vertical-align: top">
+ <h5>Select <%= port_type %></h5>
+ <div>
+ <%= select_tag(:workflow_port, port_names_for_select) %>
+ </div>
</div>
</td>
<% end %>
<% data_td = capture do %>
- <td class="data">
- <h5>Select data type</h5>
- <select id="data_type_select_<%=unique_id-%>" name="data_type" "$$('##{container_element} .data_form').each(function (f){ f.hide()});"+
- "$(this.options[this.selectedIndex].value + '_form_#{unique_id}').show();"-%>">
- <% DataItem::PERMITTED_DATA_TYPES.each do |type| %>
- <option value="<%= type -%>" <%= 'selected="selected"' if type == @data_item.data_type -%>>
- <%= DataItem::DATA_TYPE_EXPLANATIONS[type] || type -%>
- </option>
- <% end %>
- </select>
+ <td>
+ <div class="data">
+ <h5>Select data type</h5>
+ <select id="data_type_select_<%=unique_id-%>" name="data_type" "$$('##{container_element} .data_form').each(function (f){ f.hide()});"+
+ "$(this.options[this.selectedIndex].value + '_form_#{unique_id}').show();"-%>">
+ <% DataItem::PERMITTED_DATA_TYPES.each do |type| %>
+ <option value="<%= type -%>" <%= 'selected="selected"' if type == @data_item.data_type -%>>
+ <%= DataItem::DATA_TYPE_EXPLANATIONS[type] || type -%>
+ </option>
+ <% end %>
+ </select>
- <% DataItem::PERMITTED_DATA_TYPES.each do |type| %>
- <div class="data_form" id="<%=type-%>_form_<%=unique_id-%>" <%= 'style="display: none"' if !((@data_item.data_type == type) ||
- @data_item.data_type.nil? && (type == DataItem::PERMITTED_DATA_TYPES.first)) -%>>
- <%= render :partial => "data_items/data_types/#{type.underscore}/form", :locals => {:unique_id => unique_id} %>
+ <% DataItem::PERMITTED_DATA_TYPES.each do |type| %>
+ <div class="data_form" id="<%=type-%>_form_<%=unique_id-%>" <%= 'style="display: none"' if !((@data_item.data_type == type) ||
+ @data_item.data_type.nil? && (type == DataItem::PERMITTED_DATA_TYPES.first)) -%>>
+ <%= render :partial => "data_items/data_types/#{type.underscore}/form", :locals => {:unique_id => unique_id} %>
+ </div>
+ <% end %>
</div>
- <% end %>
</td>
<% end %>
<% form_tag((@data_item.id.nil? ? data_set_data_items_path(@data_set) : data_item_path(@data_item)),
Modified: branches/datasets/app/views/data_sets/_data_set.rhtml (2886 => 2887)
--- branches/datasets/app/views/data_sets/_data_set.rhtml 2011-12-21 10:32:07 UTC (rev 2886)
+++ branches/datasets/app/views/data_sets/_data_set.rhtml 2011-12-21 11:04:38 UTC (rev 2887)
@@ -1,13 +1,8 @@
<div class="data_set">
- <div style="overflow: auto">
- <div style="float:left; width: 45em;">
- <h1><%= @data_set.title %></h1>
- <%= render :partial => "contributions/datetime_info", :locals => { :contributable => @data_set } -%>
- </div>
- <div style="float:right; width: 10em;">
- <%= render :partial => "contributions/uploader_box", :locals => { :contributable => @data_set } -%>
- </div>
- </div>
+
+ <h1><%= @data_set.title %></h1>
+ <%= render :partial => "contributions/datetime_info", :locals => { :contributable => @data_set } -%>
+
<% if @data_set.workflow_version != @workflow.current_version %>
<div class="box_infotext">
<img src=""
@@ -16,16 +11,23 @@
</div>
<% end %>
- <h3>Description</h3>
- <% unless @data_set.description.blank? %>
- <div class="contribution_description">
- <%= @data_set.description_html %>
+ <div style="overflow: auto">
+ <div style="float:left; width: 45em;">
+ <h3>Description</h3>
+ <% unless @data_set.description.blank? %>
+ <div class="contribution_description">
+ <%= @data_set.description_html %>
+ </div>
+ <% else %>
+ <p class="none_text">
+ No description
+ </p>
+ <% end %>
</div>
- <% else %>
- <p class="none_text">
- No description
- </p>
- <% end %>
+ <div style="float:right; width: 10em;">
+ <%= render :partial => "contributions/uploader_box", :locals => { :contributable => @data_set } -%>
+ </div>
+ </div>
<h3>
Input data
Modified: branches/datasets/public/stylesheets/styles.css (2886 => 2887)
--- branches/datasets/public/stylesheets/styles.css 2011-12-21 10:32:07 UTC (rev 2886)
+++ branches/datasets/public/stylesheets/styles.css 2011-12-21 11:04:38 UTC (rev 2887)
@@ -2322,30 +2322,33 @@
}
.data_set td {
+ text-align: left;
+}
+
+.data_set td>div {
padding: 0.5em;
-moz-border-radius: 5px;
- text-align: left;
vertical-align: top;
}
-.data_set td.arrow {
+.data_set .arrow {
width: 16px;
vertical-align: middle;
}
-.data_set td.port {
+.data_set .port {
width: 14em;
border-width: 1px;
border-style: solid;
}
-.data_set td.data {
+.data_set .data {
border: 1px solid #CCC;
background-color: #EEE;
width: 32em;
}
-.data_set td.controls {
+.data_set .controls {
vertical-align: middle;
width: 4em;
text-align: center;
@@ -2365,21 +2368,13 @@
font-weight: bold;
margin-bottom: 0.5em;
vertical-align: middle;
+ text-align: left;
}
.data_set img {
vertical-align: middle;
}
-.data_set td div.data {
- text-align: center;
- vertical-align: middle;
-}
-
-#data_set_container {
-
-}
-
#data_set_selector {
background-color: #EEF6FF;
border: 1px solid #BBB;
@@ -2466,13 +2461,13 @@
display: block;
}
-.data_set td.data .file_data {
+.data_set .data .file_data {
padding: 0.5em;
overflow: auto;
line-height: 1.1;
}
-.data_set td.data .file_data .actions {
+.data_set .data .file_data .actions {
float: right;
width: 6em;
}