[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kupu-checkins
Subject:    [kupu-checkins] r6105 - in kupu/trunk/kupu/apache-lenya: kupu
From:       roku () codespeak ! net
Date:       2004-08-22 1:04:47
Message-ID: 20040822010447.D279A5C277 () thoth ! codespeak ! net
[Download RAW message or body]

Author: roku
Date: Sun Aug 22 03:04:43 2004
New Revision: 6105

Added:
   kupu/trunk/kupu/apache-lenya/kupu/kupudrawerstyles.css
      - copied, changed from r6096, \
kupu/trunk/kupu/apache-lenya/kupu/imagedrawer/kupudrawerstyles.css Modified:
   kupu/trunk/kupu/apache-lenya/kupu/imagedrawer/imagedrawer.xsl
   kupu/trunk/kupu/apache-lenya/kupu/lenya.kupu
   kupu/trunk/kupu/apache-lenya/kupu/wire.kupu
   kupu/trunk/kupu/apache-lenya/lenya/kupumacros.xsl
   kupu/trunk/kupu/apache-lenya/lenya/pageassets2kupulibrary.xsl
Log:
Lenya updates and clean ups.

Modified: kupu/trunk/kupu/apache-lenya/kupu/imagedrawer/imagedrawer.xsl
==============================================================================
--- kupu/trunk/kupu/apache-lenya/kupu/imagedrawer/imagedrawer.xsl	(original)
+++ kupu/trunk/kupu/apache-lenya/kupu/imagedrawer/imagedrawer.xsl	Sun Aug 22 03:04:43 \
2004 @@ -23,43 +23,40 @@
   <xsl:import href="${parameters.getParameter('root')}librarydrawer.xsl"/>
     
   <xsl:template match="resource|collection" mode="properties">
-    <xsl:if test="preview">      
-    <div><strong>Preview</strong></div>
-    <div id="epd-imgpreview">
-      <img src="{preview}" title="{title}" alt="{title}" />
-    </div>
-    </xsl:if>
-    <table>
+    <table class="resource-properties">
       <tr>
         <td>
-          <strong>Title</strong><br />
-          <xsl:value-of select="title" />
+          <div>
+            <strong>Title</strong><br />
+            <xsl:value-of select="title" />
+          </div>
+          <div>
+            <strong>Size</strong><br />
+            <xsl:value-of select="size" />
+          </div>
+          <div>
+            <strong>Description</strong><br />
+            <xsl:value-of select="description" />
+          </div>
+          <div>
+            <strong>ALT-text</strong><br />
+            <form onsubmit="return false;">
+              <input type="text" id="image_alt" size="10" />
+            </form>
+          </div>
         </td>
-      </tr>
-      <tr>
-        <td>
-          <strong>Size</strong><br />
-          <xsl:value-of select="size" />
-        </td>
-      </tr>
-      <tr>
+        <xsl:if test="preview">
         <td>
-          <strong>Description</strong><br />
-          <xsl:value-of select="description" />
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <strong>ALT-text</strong><br />
-          <form onsubmit="return false;">
-            <input type="text" id="image_alt" size="10" />
-          </form>
+          <div><strong>Preview</strong></div>
+          <div id="epd-imgpreview">
+            <img src="{preview}" title="{title}" alt="{title}"/>
+          </div>
         </td>
+        </xsl:if>
       </tr>
     </table>
   </xsl:template>
   
-  <xsl:template name="drawer-title">Image</xsl:template>
-  
+  <xsl:template name="drawer-title">Image</xsl:template>  
   <xsl:template name="url-prefix">${parameters.getParameter('root')}</xsl:template>
 </xsl:stylesheet>

Copied: kupu/trunk/kupu/apache-lenya/kupu/kupudrawerstyles.css (from r6096, \
kupu/trunk/kupu/apache-lenya/kupu/imagedrawer/kupudrawerstyles.css) \
                ==============================================================================
                
--- kupu/trunk/kupu/apache-lenya/kupu/imagedrawer/kupudrawerstyles.css	(original)
+++ kupu/trunk/kupu/apache-lenya/kupu/kupudrawerstyles.css	Sun Aug 22 03:04:43 2004
@@ -25,3 +25,22 @@
   height: 16px;
   vertical-align: middle;
 }
+
+.kupu-drawer {
+  width: 650px;
+}
+
+td#kupu-librariespanel {
+  width: 120px;
+  height: 260px;
+}
+
+td#kupu-resourcespanel {
+  width: 180px;
+  height: 260px;
+}
+
+td#kupu-propertiespanel {
+  width: 340px;
+  height: 260px;
+}
\ No newline at end of file

Modified: kupu/trunk/kupu/apache-lenya/kupu/lenya.kupu
==============================================================================
--- kupu/trunk/kupu/apache-lenya/kupu/lenya.kupu	(original)
+++ kupu/trunk/kupu/apache-lenya/kupu/lenya.kupu	Sun Aug 22 03:04:43 2004
@@ -11,5 +11,10 @@
     <script type="text/javascript" src="../apache-lenya/kupu/lenya.js">
     </script>
   </kupu:part>
+  
+  <kupu:part name="styles">
+    <link href="../apache-lenya/kupu/kupudrawerstyles.css" rel="stylesheet" \
type="text/css" /> +    <link href="../apache-lenya/kupu/kupustyles.css" \
rel="stylesheet" type="text/css" /> +  </kupu:part>
 
 </kupu:feature>

Modified: kupu/trunk/kupu/apache-lenya/kupu/wire.kupu
==============================================================================
--- kupu/trunk/kupu/apache-lenya/kupu/wire.kupu	(original)
+++ kupu/trunk/kupu/apache-lenya/kupu/wire.kupu	Sun Aug 22 03:04:43 2004
@@ -27,8 +27,8 @@
     <kupu:insert-part feature="saveonpart" part="jsincludes" />
     <kupu:insert-part feature="sourceedit" part="jsincludes" />
     <kupu:insert-part feature="drawers" part="jsincludes" />
-    <kupu:insert-part feature="exit" part="jsincludes" />
     <kupu:insert-part feature="lenya" part="jsincludes" />
+    <kupu:insert-part feature="lenya" part="styles" />
   </kupu:fill-slot>
 
   <kupu:fill-slot name="toolbar-buttons">

Modified: kupu/trunk/kupu/apache-lenya/lenya/kupumacros.xsl
==============================================================================
--- kupu/trunk/kupu/apache-lenya/lenya/kupumacros.xsl	(original)
+++ kupu/trunk/kupu/apache-lenya/lenya/kupumacros.xsl	Sun Aug 22 03:04:43 2004
@@ -14,29 +14,13 @@
   <xsl:param name="context-prefix" select="/"/>
   <xsl:param name="kupu-common-dir" 
     select="concat($context-prefix,'/kupu/common/')"/>
-  <xsl:param name="lenya-kupu-style" 
-    select="concat($context-prefix,'/kupu/apache-lenya/kupu/kupustyles.css')"/>
   <xsl:param name="kupu-logo" 
     select="concat($kupu-common-dir, 'kupuimages/kupu_icon.gif')"/>
   <xsl:param name="lenya-logo" 
     select="concat($context-prefix, '/lenya/images/project-logo-small.png')"/>
   <xsl:param name="imagedrawer-xsl-uri"/>
   <xsl:param name="imagedrawer-libraries-uri"/>
-    
-  <!--
-    Kupu head (i.e. CSS overriden by Lenya)
-  -->
-  <xsl:template match="xhtml:head">
-    <head>
-      <xsl:apply-templates/>
-      <link rel="stylesheet" type="text/css">
-        <xsl:attribute name="href">
-          <xsl:value-of select="$lenya-kupu-style"/>
-        </xsl:attribute>
-      </link>
-    </head>
-  </xsl:template>
-  
+      
   <!--
     Kupu config
   -->

Modified: kupu/trunk/kupu/apache-lenya/lenya/pageassets2kupulibrary.xsl
==============================================================================
--- kupu/trunk/kupu/apache-lenya/lenya/pageassets2kupulibrary.xsl	(original)
+++ kupu/trunk/kupu/apache-lenya/lenya/pageassets2kupulibrary.xsl	Sun Aug 22 03:04:43 \
2004 @@ -13,12 +13,15 @@
   xmlns:li="http://apache.org/cocoon/lenya/info/1.0"
  >
 
+<xsl:param name="resource-icon-url"/>
+<xsl:param name="resource-path-url"/>
+
 <xsl:template match="/">
   <collection>
     <uri>FIXME URI</uri>
     <icon></icon>
-    <title>Page Library</title>
-    <description>FIXME Description</description>
+    <title>Page Image Library</title>
+    <description>Images related to page or document.</description>
     <items>
       <xsl:apply-templates select="//li:asset"/>
     </items>
@@ -26,12 +29,16 @@
 </xsl:template>
 
 <xsl:template match="li:asset">
-  <resource id="pageres">
-    <title>Exit</title>
-    <uri>/kupu/apache-lenya/kupu/images/exit.gif</uri>
-    <icon>/kupu/apache-lenya/kupu/images/right_arrow.png</icon>
-    <description>page Demo Resource two</description>
-    <preview>/kupu/apache-lenya/kupu/images/exit.gif</preview>
+  <xsl:variable name="resource-url">
+    <xsl:value-of select="concat($resource-path-url, dc:source)"/>
+  </xsl:variable> 
+  
+  <resource id="{$resource-url}">
+    <title><xsl:value-of select="dc:source"/></title>
+    <uri><xsl:value-of select="$resource-url"/></uri>
+    <icon><xsl:value-of select="$resource-icon-url"/></icon>
+    <description><xsl:value-of select="dc:title"/></description>
+    <preview><xsl:value-of select="$resource-url"/></preview>
     <size><xsl:value-of select="dc:extent"/>&#160;kb</size>
   </resource>
 </xsl:template>


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic