Author: hasan
Date: Wed Dec 30 10:00:46 2009
New Revision: 894574
URL: http://svn.apache.org/viewvc?rev=894574&view=rev
Log:
ZZ-52 reviewer commit: updated resource panel in related projects
Added:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/images/icons/d-arr-left-inverse.png
- copied unchanged from r894392,
incubator/clerezza/issues/CLEREZZA-52/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/images/icons/d-arr-left-inverse.png
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/images/icons/d-arr-right-inverse.png
- copied unchanged from r894392,
incubator/clerezza/issues/CLEREZZA-52/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/images/icons/d-arr-right-inverse.png
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/images/panel/
- copied from r894392,
incubator/clerezza/issues/CLEREZZA-52/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/images/panel/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/images/panel/bg-tab.png
- copied unchanged from r894392,
incubator/clerezza/issues/CLEREZZA-52/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/images/panel/bg-tab.png
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/
(props changed)
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel-thumbnail.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel-tree.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/
(props changed)
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.panel.js
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/
(props changed)
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/edit.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/general.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/list.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/panel.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/style.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/tree.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/window.css
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.scripting.scriptmanager/
(props changed)
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-execution-uri-overview.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-script-overview.xhtml
Propchange:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 10:00:46 2009
@@ -0,0 +1 @@
+/incubator/clerezza/issues/CLEREZZA-52/org.apache.clerezza.app.webguiexamples:894321-894392
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel-thumbnail.xhtml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel-thumbnail.xhtml?rev=894574&r1=894573&r2=894574&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel-thumbnail.xhtml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel-thumbnail.xhtml
Wed Dec 30 10:00:46 2009
@@ -129,85 +129,95 @@
<!-- panel -->
<div class="tx-panel">
- <!-- open-close button, jquery.panel.js, toggles in the
tx-edit, tx-tree, tx-list the tx-show-panel and tx-hide-panel classes -->
- <a href="#" class="tx-icon tx-icon-left-inverse
tx-panel-open-close">remove</a>
- <form action="" method="post">
- <fieldset>
- <label>
- <input type="text" value="search
assets" />
- <input type="submit" value=""
class="tx-icon tx-icon-search"/>
- </label>
- <!-- optional input elements-->
- <label>
- <input type="radio" name="searchtype"
value="" />
- new search</label>
- <label>
- <input type="radio" name="searchtype"
value="" />
- search within results</label>
- </fieldset>
- </form>
- <!-- selected filter elements -->
- <div class="tx-filter">
- <h4>Actual filter:</h4>
- <ol>
- <!-- filter elements, tx-icon is floating
right, must be at the first place -->
- <li><a href="#" class="tx-icon
tx-icon-delete">remove</a>Tiger</li>
- <li><a href="#" class="tx-icon
tx-icon-delete">remove</a>Last Week</li>
- </ol>
- </div>
+ <!-- open-close button, jquery.panel.js, toggles in the tx-edit,
tx-tree, tx-list the tx-show-panel and tx-hide-panel classes -->
+ <a href="#"
class="tx-panel-open-close">close/open</a><h3>Filter</h3>
- <!-- results from filter -->
- <div class="tx-result">
- <!-- ul li contruct, only 2 levels supported -->
- <ol>
- <!-- main category-->
- <li><a href="#">Type</a>
- <ol>
- <!-- sub category -->
- <li><a href="#">Images
(234)</a></li>
- <li><a href="#">Videos
(20)</a></li>
- <li><a href="#">Flash
(45)</a></li>
- <li><a href="#">Documents
(234)</a></li>
- <li><a href="#">Images
(234)</a></li>
- </ol>
- </li>
- <!-- tx-open, open element icon, arrow down-->
- <li class="tx-open"><a href="#">Taxonomy</a>
- <ol>
- <li><a href="#">Images
(234)</a></li>
- <li><a href="#">Videos
(20)</a></li>
- </ol>
- </li>
- <!-- li default shows an right arrow as
background -->
- <li><a href="#">Tags</a>
- <ol>
- <li><a href="#">Tiger
(48)</a></li>
- <li><a href="#">Animal
(80)</a></li>
- <li><a href="#">Africa
(784)</a></li>
- </ol>
- </li>
- <li><a href="#">Usage</a>
- <ol>
- <li><a href="#">Website
(20)</a></li>
- <li><a href="#">News
(14)</a></li>
- </ol>
- </li>
- <li><a href="#">Time</a>
- <ol>
- <li><a href="#">Yesterday
(20)</a></li>
- <li><a href="#">Last Week
(14)</a></li>
- <li><a href="#">Last Month
(23)</a></li>
- </ol>
- </li>
- <li><a href="#">Source</a>
- <ol>
- <li><a href="#">Flickr
(14)</a></li>
- <li><a href="#">Youtube
(8)</a></li>
- </ol>
- </li>
- </ol>
- </div>
- </div>
+ <div class="tx-panel-window">
+ <!-- panel icons -->
+ <div class="tx-tab">
+
+ </div>
+
+ <div class="tx-panel-detail">
+ <div>
+ <form action="" method="post">
+ <fieldset>
+ <label>
+ <input
type="submit" value="" class="tx-icon tx-icon-search"/>
+ <input
type="text" value="search assets" />
+
+ </label>
+ </fieldset>
+ </form>
+ <!-- selected filter elements -->
+ <div class="tx-filter">
+
+ <h4><a href="#" class="tx-icon
tx-icon-delete">clear all</a><a href="">Clear All</a>Current filter:</h4>
+ <ol>
+ <!-- filter elements,
tx-icon is floating right, must be at the first place -->
+ <li><a href="#"
class="tx-icon tx-icon-delete">remove</a>Tiger</li>
+ <li><a href="#"
class="tx-icon tx-icon-delete">remove</a>Last Week</li>
+ </ol>
+ </div>
+
+ <!-- results from filter -->
+ <div class="tx-result">
+ <!-- ul li contruct, only 2 levels
supported -->
+ <ol>
+ <!-- main category-->
+ <li><a href="#">Type</a>
+ <ol>
+ <!--
sub category -->
+ <li><a
href="#">Images (234)</a></li>
+ <li><a
href="#">Videos (20)</a></li>
+ <li><a
href="#">Flash (45)</a></li>
+ <li><a
href="#">Documents (234)</a></li>
+ <li><a
href="#">Images (234)</a></li>
+ </ol>
+ </li>
+ <!-- tx-open, open
element icon, arrow down-->
+ <li class="tx-open"><a
href="#">Taxonomy</a>
+ <ol>
+ <li><a
href="#">Images (234)</a></li>
+ <li><a
href="#">Videos (20)</a></li>
+ </ol>
+ </li>
+ <!-- li default shows
an right arrow as background -->
+ <li><a href="#">Tags</a>
+ <ol>
+ <li><a
href="#">Tiger (48)</a></li>
+ <li><a
href="#">Animal (80)</a></li>
+ <li><a
href="#">Africa (784)</a></li>
+ </ol>
+ </li>
+ <li><a
href="#">Usage</a>
+ <ol>
+ <li><a
href="#">Website (20)</a></li>
+ <li><a
href="#">News (14)</a></li>
+ </ol>
+ </li>
+ <li><a href="#">Time</a>
+ <ol>
+ <li><a
href="#">Yesterday (20)</a></li>
+ <li><a
href="#">Last Week (14)</a></li>
+ <li><a
href="#">Last Month (23)</a></li>
+ </ol>
+ </li>
+ <li><a
href="#">Source</a>
+ <ol>
+ <li><a
href="#">Flickr (14)</a></li>
+ <li><a
href="#">Youtube (8)</a></li>
+ </ol>
+ </li>
+ </ol>
+ </div>
+ <!-- // tx-result -->
+ </div>
+ </div>
+ <!-- // tx-panel-detail -->
+ </div>
+ <!-- // tx-panel-window -->
+ </div>
<!-- // panel -->
<!-- list / thumbnail -->
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel-tree.xhtml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel-tree.xhtml?rev=894574&r1=894573&r2=894574&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel-tree.xhtml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel-tree.xhtml
Wed Dec 30 10:00:46 2009
@@ -139,85 +139,95 @@
<!-- panel -->
<div class="tx-panel">
- <!-- open-close button, jquery.panel.js, toggles in the
tx-edit, tx-tree, tx-list the tx-show-panel and tx-hide-panel classes -->
- <a href="#" class="tx-icon tx-icon-left-inverse
tx-panel-open-close">remove</a>
- <form action="" method="post">
- <fieldset>
- <label>
- <input type="text" value="search
assets" />
- <input type="submit" value=""
class="tx-icon tx-icon-search"/>
- </label>
- <!-- optional input elements-->
- <label>
- <input type="radio" name="searchtype"
value="" />
- new search</label>
- <label>
- <input type="radio" name="searchtype"
value="" />
- search within results</label>
- </fieldset>
- </form>
- <!-- selected filter elements -->
- <div class="tx-filter">
- <h4>Actual filter:</h4>
- <ol>
- <!-- filter elements, tx-icon is floating
right, must be at the first place -->
- <li><a href="#" class="tx-icon
tx-icon-delete">remove</a>Tiger</li>
- <li><a href="#" class="tx-icon
tx-icon-delete">remove</a>Last Week</li>
- </ol>
- </div>
+ <!-- open-close button, jquery.panel.js, toggles in the tx-edit,
tx-tree, tx-list the tx-show-panel and tx-hide-panel classes -->
+ <a href="#"
class="tx-panel-open-close">close/open</a><h3>Filter</h3>
- <!-- results from filter -->
- <div class="tx-result">
- <!-- ul li contruct, only 2 levels supported -->
- <ol>
- <!-- main category-->
- <li><a href="#">Type</a>
- <ol>
- <!-- sub category -->
- <li><a href="#">Images
(234)</a></li>
- <li><a href="#">Videos
(20)</a></li>
- <li><a href="#">Flash
(45)</a></li>
- <li><a href="#">Documents
(234)</a></li>
- <li><a href="#">Images
(234)</a></li>
- </ol>
- </li>
- <!-- tx-open, open element icon, arrow down-->
- <li class="tx-open"><a href="#">Taxonomy</a>
- <ol>
- <li><a href="#">Images
(234)</a></li>
- <li><a href="#">Videos
(20)</a></li>
- </ol>
- </li>
- <!-- li default shows an right arrow as
background -->
- <li><a href="#">Tags</a>
- <ol>
- <li><a href="#">Tiger
(48)</a></li>
- <li><a href="#">Animal
(80)</a></li>
- <li><a href="#">Africa
(784)</a></li>
- </ol>
- </li>
- <li><a href="#">Usage</a>
- <ol>
- <li><a href="#">Website
(20)</a></li>
- <li><a href="#">News
(14)</a></li>
- </ol>
- </li>
- <li><a href="#">Time</a>
- <ol>
- <li><a href="#">Yesterday
(20)</a></li>
- <li><a href="#">Last Week
(14)</a></li>
- <li><a href="#">Last Month
(23)</a></li>
- </ol>
- </li>
- <li><a href="#">Source</a>
- <ol>
- <li><a href="#">Flickr
(14)</a></li>
- <li><a href="#">Youtube
(8)</a></li>
- </ol>
- </li>
- </ol>
- </div>
- </div>
+ <div class="tx-panel-window">
+ <!-- panel icons -->
+ <div class="tx-tab">
+
+ </div>
+
+ <div class="tx-panel-detail">
+ <div>
+ <form action="" method="post">
+ <fieldset>
+ <label>
+ <input
type="submit" value="" class="tx-icon tx-icon-search"/>
+ <input
type="text" value="search assets" />
+
+ </label>
+ </fieldset>
+ </form>
+ <!-- selected filter elements -->
+ <div class="tx-filter">
+
+ <h4><a href="#" class="tx-icon
tx-icon-delete">clear all</a><a href="">Clear All</a>Current filter:</h4>
+ <ol>
+ <!-- filter elements,
tx-icon is floating right, must be at the first place -->
+ <li><a href="#"
class="tx-icon tx-icon-delete">remove</a>Tiger</li>
+ <li><a href="#"
class="tx-icon tx-icon-delete">remove</a>Last Week</li>
+ </ol>
+ </div>
+
+ <!-- results from filter -->
+ <div class="tx-result">
+ <!-- ul li contruct, only 2 levels
supported -->
+ <ol>
+ <!-- main category-->
+ <li><a href="#">Type</a>
+ <ol>
+ <!--
sub category -->
+ <li><a
href="#">Images (234)</a></li>
+ <li><a
href="#">Videos (20)</a></li>
+ <li><a
href="#">Flash (45)</a></li>
+ <li><a
href="#">Documents (234)</a></li>
+ <li><a
href="#">Images (234)</a></li>
+ </ol>
+ </li>
+ <!-- tx-open, open
element icon, arrow down-->
+ <li class="tx-open"><a
href="#">Taxonomy</a>
+ <ol>
+ <li><a
href="#">Images (234)</a></li>
+ <li><a
href="#">Videos (20)</a></li>
+ </ol>
+ </li>
+ <!-- li default shows
an right arrow as background -->
+ <li><a href="#">Tags</a>
+ <ol>
+ <li><a
href="#">Tiger (48)</a></li>
+ <li><a
href="#">Animal (80)</a></li>
+ <li><a
href="#">Africa (784)</a></li>
+ </ol>
+ </li>
+ <li><a
href="#">Usage</a>
+ <ol>
+ <li><a
href="#">Website (20)</a></li>
+ <li><a
href="#">News (14)</a></li>
+ </ol>
+ </li>
+ <li><a href="#">Time</a>
+ <ol>
+ <li><a
href="#">Yesterday (20)</a></li>
+ <li><a
href="#">Last Week (14)</a></li>
+ <li><a
href="#">Last Month (23)</a></li>
+ </ol>
+ </li>
+ <li><a
href="#">Source</a>
+ <ol>
+ <li><a
href="#">Flickr (14)</a></li>
+ <li><a
href="#">Youtube (8)</a></li>
+ </ol>
+ </li>
+ </ol>
+ </div>
+ <!-- // tx-result -->
+ </div>
+ </div>
+ <!-- // tx-panel-detail -->
+ </div>
+ <!-- // tx-panel-window -->
+ </div>
<!-- // panel -->
<!-- tree view -->
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel.xhtml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel.xhtml?rev=894574&r1=894573&r2=894574&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel.xhtml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/src/main/resources/org/apache/clerezza/app/webguiexamples/staticweb/panel.xhtml
Wed Dec 30 10:00:46 2009
@@ -20,85 +20,95 @@
<!-- panel -->
<div class="tx-panel">
- <!-- open-close button, jquery.panel.js, toggles in the
tx-edit, tx-tree, tx-list the tx-show-panel and tx-hide-panel classes -->
- <a href="#" class="tx-icon tx-icon-left-inverse
tx-panel-open-close">remove</a>
- <form action="" method="post">
- <fieldset>
- <label>
- <input type="text" value="search
assets" />
- <input type="submit" value=""
class="tx-icon tx-icon-search"/>
- </label>
- <!-- optional input elements-->
- <label>
- <input type="radio" name="searchtype"
value="" />
- new search</label>
- <label>
- <input type="radio" name="searchtype"
value="" />
- search within results</label>
- </fieldset>
- </form>
- <!-- selected filter elements -->
- <div class="tx-filter">
- <h4>Actual filter:</h4>
- <ol>
- <!-- filter elements, tx-icon is floating
right, must be at the first place -->
- <li><a href="#" class="tx-icon
tx-icon-delete">remove</a>Tiger</li>
- <li><a href="#" class="tx-icon
tx-icon-delete">remove</a>Last Week</li>
- </ol>
- </div>
-
- <!-- results from filter -->
- <div class="tx-result">
- <!-- ul li contruct, only 2 levels supported -->
- <ol>
- <!-- main category-->
- <li><a href="#">Type</a>
- <ol>
- <!-- sub category -->
- <li><a href="#">Images
(234)</a></li>
- <li><a href="#">Videos
(20)</a></li>
- <li><a href="#">Flash
(45)</a></li>
- <li><a href="#">Documents
(234)</a></li>
- <li><a href="#">Images
(234)</a></li>
- </ol>
- </li>
- <!-- tx-open, open element icon, arrow down-->
- <li class="tx-open"><a href="#">Taxonomy</a>
- <ol>
- <li><a href="#">Images
(234)</a></li>
- <li><a href="#">Videos
(20)</a></li>
- </ol>
- </li>
- <!-- li default shows an right arrow as
background -->
- <li><a href="#">Tags</a>
- <ol>
- <li><a href="#">Tiger
(48)</a></li>
- <li><a href="#">Animal
(80)</a></li>
- <li><a href="#">Africa
(784)</a></li>
- </ol>
- </li>
- <li><a href="#">Usage</a>
- <ol>
- <li><a href="#">Website
(20)</a></li>
- <li><a href="#">News
(14)</a></li>
- </ol>
- </li>
- <li><a href="#">Time</a>
- <ol>
- <li><a href="#">Yesterday
(20)</a></li>
- <li><a href="#">Last Week
(14)</a></li>
- <li><a href="#">Last Month
(23)</a></li>
- </ol>
- </li>
- <li><a href="#">Source</a>
- <ol>
- <li><a href="#">Flickr
(14)</a></li>
- <li><a href="#">Youtube
(8)</a></li>
- </ol>
- </li>
- </ol>
- </div>
- </div>
+ <!-- open-close button, jquery.panel.js, toggles in the tx-edit,
tx-tree, tx-list the tx-show-panel and tx-hide-panel classes -->
+ <a href="#"
class="tx-panel-open-close">close/open</a><h3>Filter</h3>
+
+ <div class="tx-panel-window">
+ <!-- panel icons -->
+ <div class="tx-tab">
+
+ </div>
+
+ <div class="tx-panel-detail">
+ <div>
+ <form action="" method="post">
+ <fieldset>
+ <label>
+ <input
type="submit" value="" class="tx-icon tx-icon-search"/>
+ <input
type="text" value="search assets" />
+
+ </label>
+ </fieldset>
+ </form>
+ <!-- selected filter elements -->
+ <div class="tx-filter">
+
+ <h4><a href="#" class="tx-icon
tx-icon-delete">clear all</a><a href="">Clear All</a>Current filter:</h4>
+ <ol>
+ <!-- filter elements,
tx-icon is floating right, must be at the first place -->
+ <li><a href="#"
class="tx-icon tx-icon-delete">remove</a>Tiger</li>
+ <li><a href="#"
class="tx-icon tx-icon-delete">remove</a>Last Week</li>
+ </ol>
+ </div>
+
+ <!-- results from filter -->
+ <div class="tx-result">
+ <!-- ul li contruct, only 2 levels
supported -->
+ <ol>
+ <!-- main category-->
+ <li><a href="#">Type</a>
+ <ol>
+ <!--
sub category -->
+ <li><a
href="#">Images (234)</a></li>
+ <li><a
href="#">Videos (20)</a></li>
+ <li><a
href="#">Flash (45)</a></li>
+ <li><a
href="#">Documents (234)</a></li>
+ <li><a
href="#">Images (234)</a></li>
+ </ol>
+ </li>
+ <!-- tx-open, open
element icon, arrow down-->
+ <li class="tx-open"><a
href="#">Taxonomy</a>
+ <ol>
+ <li><a
href="#">Images (234)</a></li>
+ <li><a
href="#">Videos (20)</a></li>
+ </ol>
+ </li>
+ <!-- li default shows
an right arrow as background -->
+ <li><a href="#">Tags</a>
+ <ol>
+ <li><a
href="#">Tiger (48)</a></li>
+ <li><a
href="#">Animal (80)</a></li>
+ <li><a
href="#">Africa (784)</a></li>
+ </ol>
+ </li>
+ <li><a
href="#">Usage</a>
+ <ol>
+ <li><a
href="#">Website (20)</a></li>
+ <li><a
href="#">News (14)</a></li>
+ </ol>
+ </li>
+ <li><a href="#">Time</a>
+ <ol>
+ <li><a
href="#">Yesterday (20)</a></li>
+ <li><a
href="#">Last Week (14)</a></li>
+ <li><a
href="#">Last Month (23)</a></li>
+ </ol>
+ </li>
+ <li><a
href="#">Source</a>
+ <ol>
+ <li><a
href="#">Flickr (14)</a></li>
+ <li><a
href="#">Youtube (8)</a></li>
+ </ol>
+ </li>
+ </ol>
+ </div>
+ <!-- // tx-result -->
+ </div>
+ </div>
+ <!-- // tx-panel-detail -->
+ </div>
+ <!-- // tx-panel-window -->
+ </div>
<!-- // panel -->
<div class="tx-edit tx-show-panel">
@@ -118,55 +128,79 @@
<h3>Example code</h3>
<pre>
+<!-- panel -->
+<div class="tx-panel">
<!-- open-close button, jquery.panel.js, toggles in the tx-edit, tx-tree,
tx-list the tx-show-panel and tx-hide-panel classes -->
-<a href="#" class="tx-icon tx-icon-left-inverse
tx-panel-open-close">remove</a>
-<form action="" method="post">
- <fieldset>
- <label>
- <input type="text" value="search assets" />
- <input type="submit" value="" class="tx-icon
tx-icon-search"/>
- </label>
- </fieldset>
-</form>
-<!-- selected filter elements -->
-<div class="tx-filter">
- <h4>Actual filter:</h4>
- <ol>
- <!-- filter elements, tx-icon is floating right, must be at
the first place -->
- <li><a href="#" class="tx-icon
tx-icon-delete">remove</a>Tiger</li>
- <li><a href="#" class="tx-icon
tx-icon-delete">remove</a>Last Week</li>
- </ol>
-</div>
-
-<!-- results from filter -->
-<div class="tx-result">
-<!-- ul li contruct, only 2 levels supported -->
- <ol>
- <!-- main category-->
- <li><a href="#">Type</a>
- <ol>
- <!-- sub category -->
- <li><a href="#">Images
(234)</a></li>
- <li><a href="#">Videos
(20)</a></li>
- <li><a href="#">Flash
(45)</a></li>
- </ol>
- </li>
- <!-- tx-open, open element icon, arrow down-->
- <li class="tx-open"><a href="#">Taxonomy</a>
- <ol>
- <li><a href="#">Images
(234)</a></li>
- <li><a href="#">Videos
(20)</a></li>
- </ol>
- </li>
- <!-- li default shows an right arrow as background -->
- <li><a href="#">Tags</a>
- <ol>
- <li><a href="#">Tiger
(48)</a></li>
- <li><a href="#">Animal
(80)</a></li>
- </ol>
- </li>
- </ol>
-</div>
+ <a href="#"
class="tx-panel-open-close">close/open</a><h3>Filter</h3>
+
+ <div class="tx-panel-window">
+ <!-- panel icons -->
+ <div class="tx-tab">
+
+ </div>
+
+ <div class="tx-panel-detail">
+ <div>
+ <form action="" method="post">
+ <fieldset>
+ <label>
+ <input type="submit"
value="" class="tx-icon tx-icon-search"/>
+ <input type="text"
value="search assets" />
+
+ </label>
+ </fieldset>
+ </form>
+ <!-- selected filter elements -->
+ <div class="tx-filter">
+
+ <h4><a href="#" class="tx-icon
tx-icon-delete">clear all</a><a href="">Clear
All</a>Current filter:</h4>
+ <ol>
+ <!-- filter elements,
tx-icon is floating right, must be at the first place -->
+ <li><a href="#"
class="tx-icon tx-icon-delete">remove</a>Tiger</li>
+ <li><a href="#"
class="tx-icon tx-icon-delete">remove</a>Last Week</li>
+ </ol>
+ </div>
+
+ <!-- results from filter -->
+ <div class="tx-result">
+ <!-- ul li contruct, only 2 levels supported
-->
+ <ol>
+ <!-- main category-->
+ <li><a
href="#">Type</a>
+ <ol>
+ <!-- sub
category -->
+ <li><a
href="#">Images (234)</a></li>
+ <li><a
href="#">Videos (20)</a></li>
+ <li><a
href="#">Flash (45)</a></li>
+ <li><a
href="#">Documents (234)</a></li>
+ <li><a
href="#">Images (234)</a></li>
+ </ol>
+ </li>
+ <!-- tx-open, open element
icon, arrow down-->
+ <li class="tx-open"><a
href="#">Taxonomy</a>
+ <ol>
+ <li><a
href="#">Images (234)</a></li>
+ <li><a
href="#">Videos (20)</a></li>
+ </ol>
+ </li>
+ <!-- li default shows an
right arrow as background -->
+ <li><a
href="#">Tags</a>
+ <ol>
+ <li><a
href="#">Tiger (48)</a></li>
+ <li><a
href="#">Animal (80)</a></li>
+ <li><a
href="#">Africa (784)</a></li>
+ </ol>
+ </li>
+ </ol>
+ </div>
+ <!-- // tx-result -->
+ </div>
+ </div>
+ <!-- // tx-panel-detail -->
+ </div>
+ <!-- // tx-panel-window -->
+</div>
+<!-- // panel -->
</pre>
</div>
Propchange:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 10:00:46 2009
@@ -0,0 +1 @@
+/incubator/clerezza/issues/CLEREZZA-52/org.apache.clerezza.web.resources.jquery:894321-894392
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.panel.js
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.panel.js?rev=894574&r1=894573&r2=894574&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.panel.js
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/src/main/resources/org/apache/clerezza/web/resources/jquery/staticweb/jquery.panel.js
Wed Dec 30 10:00:46 2009
@@ -3,15 +3,14 @@
$(this).find("ol").toggle();
if ($(this).children().is(":hidden"))
$(this).removeClass("tx-open");
- else
+ else
$(this).addClass("tx-open");
});
$('.tx-panel-open-close').bind("click",function(){
-
+
var oPanel =
$('.tx-panel').children().not(".tx-panel-open-close");
- oPanel.toggle();
- if (oPanel.is(":hidden")) {
+ if (!$('.tx-panel').hasClass("tx-close")) {
$(this).removeClass("tx-icon-left-inverse");
$(this).addClass("tx-icon-right-inverse");
$('.tx-panel').addClass("tx-close");
@@ -20,15 +19,15 @@
$('.tx-edit').addClass("tx-hide-panel").removeClass("tx-show-panel");
$('.tx-tree').addClass("tx-hide-panel").removeClass("tx-show-panel");
}
- else {
+ else {
$(this).removeClass("tx-icon-right-inverse");
$(this).addClass("tx-icon-left-inverse");
$('.tx-panel').removeClass("tx-close");
$(this).removeClass("tx-close");
$('.tx-list').addClass("tx-show-panel").removeClass("tx-hide-panel");
$('.tx-edit').addClass("tx-show-panel").removeClass("tx-hide-panel");
-
$('.tx-tree').addClass("tx-show-panel").removeClass("tx-hide-panel");
+
$('.tx-tree').addClass("tx-show-panel").removeClass("tx-hide-panel");
}
- });
-
+ });
+
});
Propchange:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 10:00:46 2009
@@ -0,0 +1 @@
+/incubator/clerezza/issues/CLEREZZA-52/org.apache.clerezza.web.resources.style:894321-894392
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/edit.css
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/edit.css?rev=894574&r1=894573&r2=894574&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/edit.css
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/edit.css
Wed Dec 30 10:00:46 2009
@@ -1,5 +1,3 @@
-/* edit */
-
.tx-edit {
position: absolute;
top: 0;
@@ -16,17 +14,17 @@
}
.tx-edit.tx-show-panel {
- left: 20.0em;
+ left: 28em;
}
.tx-edit.tx-hide-panel {
- left: 3.0em;
+ left: 5em;
}
.tx-edit.tx-halfwidth-right {
left: 51%;
padding-left: 1.6em;
- border-left: solid 1px #e4e4e4;
+ border-left: solid 1px #e4e4e4;
}
.tx-edit .tx-edit-header, .tx-edit h3 {
@@ -34,7 +32,7 @@
padding: 0;
padding-bottom: 0.5em;
color: #999999;
- font-size: 1.5em;
+ font-size: 1.8em;
}
/* +yui */
@@ -45,8 +43,8 @@
width: 100%;
height: 5em;
margin: 0;
- padding: 0;
- list-style: none;
+ padding: 0;
+ list-style: none;
}
ol.tx-edit-tabs li, .tx-edit ul.yui-nav li {
@@ -62,13 +60,13 @@
ol.tx-edit-tabs li a, ul.yui-nav li a {
color: #666666;
display: block;
- padding: 0.8em 1.2em;
+ padding: 0.8em 1.2em;
text-decoration: none;
}
ol.tx-edit-tabs li a:visited, ol.tx-edit-tabs li a:link,
ul.yui-nav li a:visited, ul.yui-nav li a:link {
-
+
}
ol.tx-edit-tabs li a:active, ol.tx-edit-tabs li a:hover,
@@ -95,7 +93,7 @@
.tx-edit-info div {
padding-bottom: 1.6em;
-
+
}
.tx-edit-info div span {
@@ -126,7 +124,7 @@
padding: 0 0 0.4em 0;
margin: 0;
margin-top: 0.4em;
- line-height: 1.8em;
+ line-height: 1.8em;
}
.tx-edit .tx-line {
@@ -165,4 +163,3 @@
.tx-edit fieldset li span.tx-item a {
float: right;
}
-
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/general.css
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/general.css?rev=894574&r1=894573&r2=894574&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/general.css
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/general.css
Wed Dec 30 10:00:46 2009
@@ -17,13 +17,13 @@
}
a {
- color: #34c0da;
+ color: #1c6d8b;
text-decoration: none;
outline: none;
}
a:active, a:hover {
- color: #34c0da;
+ color: #1c6d8b;
text-decoration: underline;
}
@@ -75,5 +75,4 @@
display: block;
background-color: #f4e0e0;
padding-left: 4em;
- margin-bottom: 1em;
-}
\ No newline at end of file
+ margin-bottom: 1em;
\ No newline at end of file
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/list.css
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/list.css?rev=894574&r1=894573&r2=894574&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/list.css
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/list.css
Wed Dec 30 10:00:46 2009
@@ -4,18 +4,18 @@
top: 0;
bottom: 0;
left: 0;
- right: 0;
+ right: 0;
width: auto;
overflow-y: auto;
overflow-x: hidden;
}
.tx-list.tx-show-panel {
- left: 20em;
+ left: 28em;
}
.tx-list.tx-hide-panel {
- left: 3em;
+ left: 5em;
}
.tx-list.tx-halfwidth-left {
@@ -25,7 +25,7 @@
.tx-list.tx-halfwidth-right {
left: 51%;
padding-left: 1.6em;
- border-left: solid 1px #e4e4e4;
+ border-left: solid 1px #e4e4e4;
}
.tx-list ol {
@@ -121,6 +121,6 @@
}
.tx-list ol li div.tx-thumb a:hover img {
- border: solid 3px #34c0da;
+ border: solid 3px #1c6d8b;
text-decoration: none;
-}
+}
\ No newline at end of file
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/panel.css
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/panel.css?rev=894574&r1=894573&r2=894574&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/panel.css
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/panel.css
Wed Dec 30 10:00:46 2009
@@ -4,48 +4,70 @@
top: 0;
bottom: 0;
left: 0.5em;
- width: 18.3em;
- overflow-y: auto;
- overflow-x: hidden;
- border-right: solid 1px #e4e4e4;
-}
+ width: 27em;
+}
.tx-panel.tx-close {
- width: 1.6em;
- background-color: #aaaaaa;
-}
-
+ width: 26px;
+ overflow: hidden;
+}
-.tx-panel label {
- display: block;
- padding: 0.4em 0.5em 0.4em 0.3em;
- height: 1.4em;
+.tx-panel.tx-close .tx-tab ol {
+ display: none;
}
-.tx-panel fieldset label:first-child {
- border-bottom: solid 1px #ffffff;
- height: 1.8em;
- background-repeat: repeat-x;
- background-image: url(./images/bg/fade-panel-search.png);
+.tx-panel .tx-panel-window {
+ overflow-y: auto;
+ overflow-x: hidden;
+ position: absolute;
+ top: 2.5em;
+ bottom: 0em;
+ left: 0em;
+ width: 26em;
}
-.tx-panel fieldset {
- background-color: #e7e7e7;
- width: 16.7em;
- background-image: url(./images/bg/fade-panel.png);
+.tx-panel h3 {
+ background-image: url(./images/bg/fade-panel-search.png);
+ color: #ffffff;
+ font-size: 1.0em;
+ height: 27px;
+ line-height: 2.2em;
+ margin: 0 0 0.5em 26px;
+ width: 21em;
+ /* for the border of the tx-panel2-detail box */
+ padding-right: 2px;
+ padding-left: 1em;
+}
+
+.tx-panel-detail {
+ border: solid 1px #bdbdbd;
+ margin-left: 26px;
+ width: 22em;
+ min-height: 98%;
+}
+
+.tx-panel-detail > div {
+ padding: 1em;
+ background-image: url(./images/bg/fade-filter.png);
background-repeat: repeat-x;
- border-bottom: solid 1px #ffffff;
}
+
+.tx-panel label {
+ display: block;
+ height: 1.4em;
+}
+
+
.tx-panel input[type="text"] {
float: none;
display: inline;
- width: 10em;
+ width: 16.5em;
}
.tx-panel input[type="button"], .tx-panel input[type="submit"] {
- float: none;
+ float: right;
display: inline;
}
@@ -55,55 +77,62 @@
}
.tx-panel .tx-panel-open-close {
- color: #ffffff;
- background-color: #414143;
- display: block;
- height: 2.6em;
- width: 1.6em;
- position: absolute;
- top: 0;
- left: 15.1em;
- z-index: 10;
+ background: url(./images/icons/d-arr-left-inverse.png) center no-repeat;
+ width: 26px;
+ height: 27px;
text-indent: -9999px;
-}
+ text-align: left;
+ display: block;
+ float: left;
+ border: none;
-.tx-panel .tx-panel-open-close.tx-close {
- left: 0;
-}
+}
-.tx-result {
- width: 16.7em;
+.tx-panel .tx-panel-open-close.tx-close {
+ background: url(./images/icons/d-arr-right-inverse.png) center
no-repeat;
}
+
.tx-result ol {
margin: 0;
padding: 0;
list-style: none;
- background-color: #34c0da;
+
}
.tx-result > ol > li {
background-image: url(./images/icons/arr-right-inverse.png);
background-repeat: no-repeat;
- background-position: 0.5em 0.65em;
+ background-position: 0.5em 0.4em;
border-bottom-width: 1px;
border-bottom-style: solid;
border-bottom-color: #ffffff;
+ background-color: #cccccc;
}
.tx-result > ol > li.tx-open {
background-image: url(./images/icons/arr-down-inverse.png);
background-repeat: no-repeat;
- background-position: 0.5em 0.65em;
+ background-position: 0.5em 0.4em;
}
.tx-result ol li a {
color: #ffffff;
text-decoration: none;
display: block;
- padding: 0.4em 0.2em 0.3em 1.9em;
+ padding: 0.2em 0.2em 0.2em 1.9em;
+}
+
+.tx-result > ol > li li:first-child {
+ border-top: none;
}
+
+.tx-result > ol > li li {
+ border-top: solid 1px #e6e6e6;
+}
+
+
.tx-result li a:visited, .tx-result li a:link {
color: #ffffff;
}
@@ -113,7 +142,7 @@
}
.tx-result ol ol {
- background-color: #ddf1f5;
+ background-color: #ffffff;
display: none;
}
@@ -125,16 +154,101 @@
}
.tx-result ol li li a {
- color: #000000;
- padding: 0.4em 0.2em 0.3em 1.9em;
+ color: #666666;
+ padding: 0.2em 0.2em 0.2em 1.9em;
}
.tx-result ol li li a:visited, .tx-result ol li li a:link {
- color: #000000;
+ color: #666666;
}
.tx-result ol li li a:active, .tx-result ol li li a:hover {
+ color: #333333;
+}
+
+
+/* filter (in panel)*/
+
+.tx-panel .tx-filter {
+ background-color: #FFFFFF;
+ padding: 1em 0 2em 0;
+ background-repeat: repeat-x;
+}
+
+.tx-panel .tx-filter h4 {
+ font-weight: normal;
+ margin: 0;
+ padding: 0;
+ padding-left: 0.3em;
+ padding-bottom: 0.5em;
+ color: #666666;
+ font-size: 1.0em;
+ min-height: 1.8em;
+ line-height: 1.5em;
+}
+
+.tx-panel .tx-filter ol {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
+.tx-panel .tx-filter ol li {
+ background-color: #fff2e4;
+ margin: 0;
+ padding: 0 0 0 1.0em;
+ color: #000000;
+ height: 1.7em;
+ border-bottom: solid 1px #ffffff;
+ line-height: 1.6em;
+}
+
+.tx-panel .tx-filter a {
+ float: right;
color: #000000;
}
+.tx-panel .tx-filter h4 a{
+ margin-left: 0.5em;
+ color: #cc3333;
+}
+
+
+/* tabs */
+
+.tx-panel .tx-tab {
+ background-color: #dadada;
+ background-image: url(./images/panel/bg-tab.png);
+ background-repeat: repeat-y;
+ min-height: 98%;
+ float: left;
+ width: 26px;
+ padding-bottom: 2px;
+}
+
+.tx-panel .tx-tab ol {
+ width: 26px;
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
+.tx-panel .tx-tab li {
+ margin: 0;
+ padding: 0;
+}
+
+.tx-panel .tx-tab li a {
+ height: 30px;
+ width: 26px;
+ display: block;
+ background-position: center;
+ background-repeat: no-repeat;
+ text-indent: -9999px;
+}
+.tx-panel .tx-tab li.tx-active a {
+ background-color: #ffffff;
+ border: solid 1px #bdbdbd;
+ border-right: none;
+}
\ No newline at end of file
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/style.css
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/style.css?rev=894574&r1=894573&r2=894574&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/style.css
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/style.css
Wed Dec 30 10:00:46 2009
@@ -10,7 +10,6 @@
@import "list.css";
@import "table.css";
@import "edit.css";
-...@import "filter.css";
@import "pager.css";
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/tree.css
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/tree.css?rev=894574&r1=894573&r2=894574&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/tree.css
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/tree.css
Wed Dec 30 10:00:46 2009
@@ -14,12 +14,12 @@
}
.tx-tree.tx-show-panel {
- left: 20em;
+ left: 28em;
width: auto;
}
.tx-tree.tx-hide-panel {
- left: 3em;
+ left: 5em;
width: auto;
}
@@ -73,7 +73,6 @@
}
.tx-tree li a {
- color: #ffffff;
text-decoration: none;
padding: 0 0.2em 0 0;
line-height: 1.5em;
@@ -87,12 +86,10 @@
}
.tx-tree li a + a:visited, .tx-tree li a + a:link {
- color: #34c0da;
text-decoration: none;
}
.tx-tree li a + a:active, .tx-tree li a + a:hover {
- color: #34c0da;
text-decoration: underline;
}
@@ -104,11 +101,9 @@
}
.tx-tree li a:visited, .tx-tree li a:link {
- color: #000000;
}
.tx-tree li a:active, .tx-tree li a:hover {
- color: #000000;
}
.tx-tree input[type="checkbox"] {
@@ -316,4 +311,4 @@
.tx-tree .tx-nodrag table tr > th:first-child {
width: 0.5em;
-}
+}
\ No newline at end of file
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/window.css
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/window.css?rev=894574&r1=894573&r2=894574&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/window.css
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/staticweb/window.css
Wed Dec 30 10:00:46 2009
@@ -73,7 +73,7 @@
margin: 0;
padding: 0.5em 0 1em 0;
color: #999999;
- font-size: 1.5em;
+ font-size: 1.8em;
font-weight: normal;
}
Propchange:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.scripting.scriptmanager/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 30 10:00:46 2009
@@ -0,0 +1 @@
+/incubator/clerezza/issues/CLEREZZA-52/org.apache.clerezza.platform.scripting.scriptmanager:894321-894392
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-execution-uri-overview.xhtml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-execution-uri-overview.xhtml?rev=894574&r1=894573&r2=894574&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-execution-uri-overview.xhtml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-execution-uri-overview.xhtml
Wed Dec 30 10:00:46 2009
@@ -50,13 +50,21 @@
</div>
<div id="tx-content">
<div class="tx-panel" id="tx-panel">
- <a href="#" class="tx-icon tx-icon-left-inverse
tx-panel-open-close" id="tx-panel-open-close">remove</a>
- <div id="tx-result" class="tx-result">
- ${render(./sma:scriptList , "naked")}
- </div>
- </div>
+ <a href="#" class="tx-panel-open-close tx-icon-left-inverse"
id="tx-panel-open-close">open/close</a>
+ <h3>Scripts</h3>
+ <div class="tx-panel-window">
+ <div class="tx-tab"> </div>
+ <div class="tx-panel-detail">
+ <div id="tx-result"
class="tx-result">
+
+
${render(./sma:scriptList , "naked")}
+
+ </div>
+ </div>
+ </div>
+ </div>
- <div id="tx-list" class="tx-list tx-padding-full tx-show-panel">
+ <div id="tx-list" class="tx-edit tx-show-panel">
</div>
</div>
</body>
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-script-overview.xhtml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-script-overview.xhtml?rev=894574&r1=894573&r2=894574&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-script-overview.xhtml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/resources/org/apache/clerezza/platform/scripting/scriptmanager/scriptmanager-script-overview.xhtml
Wed Dec 30 10:00:46 2009
@@ -82,15 +82,20 @@
</div>
<div id="tx-content">
<div class="tx-panel" id="tx-panel">
- <a href="#" class="tx-icon tx-icon-left-inverse
tx-panel-open-close" id="tx-panel-open-close">remove</a>
-
- <div id="tx-result" class="tx-result">
-
- ${render(sma:scriptList , "naked")}
-
- </div>
+ <a href="#" class="tx-panel-open-close tx-icon-left-inverse"
id="tx-panel-open-close">open/close</a>
+ <h3>Scripts</h3>
+ <div class="tx-panel-window">
+ <div class="tx-tab"> </div>
+ <div class="tx-panel-detail">
+ <div id="tx-result"
class="tx-result">
+
+ ${render(sma:scriptList
, "naked")}
+
+ </div>
+ </div>
+ </div>
</div>
- <div class="tx-list tx-padding-full tx-show-panel" id="tx-list">
+ <div class="tx-edit tx-show-panel" id="tx-list">
${if sma:script}
${render(sma:script, "naked")}
${/if}
