Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

changed the html structure of the fragmentsView

  • Loading branch information...
commit 51013bdaa1dd6a41188411c3db2f125e6f8d8c17 1 parent 6569fcc
@marubinotto authored
View
131 src/main/webapp/macro/fragments.vm
@@ -17,70 +17,69 @@ jQuery(function() {
//]]>
</script>
-<div class="view-header">
- ## label
- <div class="view-label" style="display: none;">
- <span class="label">
- <span class="title">All</span>:
- <span class="count"></span>
- </span>
- #if ($jsAddFragment)
- #newFragmentButtons($jsAddFragment $jsAddFile)
- #end
- </div>
-
- ## control
- <table class="view-control" width="100%" cellpadding="0" cellspacing="0" border="0" style="display: none;">
- <tr>
- <td align="left" width="18" nowrap="nowrap">
- <img src="$context/images/zoom.png?$version" border="0" alt="" style="margin: -2px;"/>
- </td>
- <td align="left">
- <div class="view-slider"></div>
- </td>
- #if ($sortable)
- <td align="right" style="padding-right: 10px;">
- <form class="sort-fragments" action="">
- <table cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td valign="middle" style="padding-right: 10px;">
- <a class="tool-button" href="#" title="$messages.get("shuffle")"
- onclick="fragmentsView_${id}.shuffle(); return false;">
- <img src="$context/images/shuffle.png" border="0" alt="$messages.get("shuffle")" style="padding: 2px;"/></a>
- </td>
- <td valign="middle">
- <select class="select-orderBy" name="orderBy">
- #foreach ($field in $fragmentFields)
- <option value="$field.value" #if ($fragmentsViewOrderBy == $field.value) selected="selected" #end
- >$messages.get("field-${field.name}")</option>
- #end
- </select>
- </td>
- <td valign="middle">
- <div class="select-switch select-ascending-or-not">
- <button type="button" name="ascending"
- #if ($fragmentsViewAscending) class="selected" #end
- ><img src="$context/images/order-ascending.png" border="0" alt=""/></button><button
- type="button" name="descending"
- #if (!$fragmentsViewAscending) class="selected" #end
- ><img src="$context/images/order-descending.png" border="0" alt=""/></button>
- </div>
- </td>
- </tr>
- </table>
- </form>
- </td>
- #end
- #if ($atomUrl)
- <td align="right" width="25">
- <a href="$atomUrl" style="margin-left: 3px; margin-right: 5px;">
- <img src="$context/images/feed.png" border="0" alt="Feed"/></a>
- </td>
- #end
- </tr>
- </table>
+## header
+<div class="view-header" style="display: none;">
+ <span class="label">
+ <span class="title">All</span>:
+ <span class="count"></span>
+ </span>
+ #if ($jsAddFragment)
+ #newFragmentButtons($jsAddFragment $jsAddFile)
+ #end
</div>
+## control
+<table class="view-control" width="100%" cellpadding="0" cellspacing="0" border="0" style="display: none;">
+<tr>
+ <td align="left" width="18" nowrap="nowrap">
+ <img src="$context/images/zoom.png?$version" border="0" alt="" style="margin: -2px;"/>
+ </td>
+ <td align="left">
+ <div class="view-slider"></div>
+ </td>
+ #if ($sortable)
+ <td align="right" style="padding-right: 10px;">
+ <form class="sort-fragments" action="">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td valign="middle" style="padding-right: 10px;">
+ <a class="tool-button" href="#" title="$messages.get("shuffle")"
+ onclick="fragmentsView_${id}.shuffle(); return false;">
+ <img src="$context/images/shuffle.png" border="0" alt="$messages.get("shuffle")" style="padding: 2px;"/></a>
+ </td>
+ <td valign="middle">
+ <select class="select-orderBy" name="orderBy">
+ #foreach ($field in $fragmentFields)
+ <option value="$field.value" #if ($fragmentsViewOrderBy == $field.value) selected="selected" #end
+ >$messages.get("field-${field.name}")</option>
+ #end
+ </select>
+ </td>
+ <td valign="middle">
+ <div class="select-switch select-ascending-or-not">
+ <button type="button" name="ascending"
+ #if ($fragmentsViewAscending) class="selected" #end
+ ><img src="$context/images/order-ascending.png" border="0" alt=""/></button><button
+ type="button" name="descending"
+ #if (!$fragmentsViewAscending) class="selected" #end
+ ><img src="$context/images/order-descending.png" border="0" alt=""/></button>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </td>
+ #end
+ #if ($atomUrl)
+ <td align="right" width="25">
+ <a href="$atomUrl" style="margin-left: 3px; margin-right: 5px;">
+ <img src="$context/images/feed.png" border="0" alt="Feed"/></a>
+ </td>
+ #end
+</tr>
+</table>
+
+## content
<div class="view-content"></div>
</div>
@@ -94,10 +93,10 @@ jQuery(function() {
<script type="text/javascript">
//<![CDATA[
jQuery(function() {
- var label = jQuery("#$view.viewId div.view-label");
- label.find("span.title").html('$utils.raw($label)');
- label.find("span.count").text('$format.decimal($fragments.totalSize) $messages.get("items")');
- label.show();
+ var header = jQuery("#$view.viewId div.view-header");
+ header.find("span.title").html('$utils.raw($label)');
+ header.find("span.count").text('$format.decimal($fragments.totalSize) $messages.get("items")');
+ header.show();
});
//]]>
</script>
View
10 src/main/webapp/style/piggydb-fragments.css
@@ -421,14 +421,14 @@ div.children table.children-control button.children-content-toggle {
margin-bottom: 10px;
}
-.fragments-view div.view-label {
+.fragments-view div.view-header {
margin-top: 5px;
margin-bottom: 15px;
font-weight: normal;
font-size: 9pt;
}
-.fragments-view div.view-label span.label {
+.fragments-view div.view-header span.label {
border: 1px solid #ccc;
border-radius: 5px 0px 0px 0px;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1) inset;
@@ -442,13 +442,13 @@ div.children table.children-control button.children-content-toggle {
vertical-align: middle;
}
-.fragments-view div.view-label span.label span.count {
+.fragments-view div.view-header span.label span.count {
color: #999;
font-size: 8pt;
margin-left: 5px;
}
-.fragments-view div.view-label span.new-fragment-buttons {
+.fragments-view div.view-header span.new-fragment-buttons {
margin: 0px;
margin-left: 5px;
@@ -456,7 +456,7 @@ div.children table.children-control button.children-content-toggle {
vertical-align: middle;
}
-.fragments-view div.view-label span.new-fragment-buttons img {
+.fragments-view div.view-header span.new-fragment-buttons img {
vertical-align: middle;
margin-top: -3px;
}
Please sign in to comment.
Something went wrong with that request. Please try again.