You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2003/06/16 11:34:32 UTC

cvs commit: cocoon-lenya/src/webapp/lenya info.xmap usecase.xmap

gregor      2003/06/16 02:34:32

  Modified:    src/webapp/lenya/xslt/info info.xsl root.xsl
               src/webapp/lenya info.xmap usecase.xmap
  Log:
  fixed several small issues with the info area pane
  
  - javascript now loads on every URI
  - pane is not passed through style-cms-page
  
  Revision  Changes    Path
  1.4       +2 -2      cocoon-lenya/src/webapp/lenya/xslt/info/info.xsl
  
  Index: info.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/info/info.xsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- info.xsl	11 Jun 2003 09:39:55 -0000	1.3
  +++ info.xsl	16 Jun 2003 09:34:32 -0000	1.4
  @@ -17,7 +17,7 @@
       <html>
   <head>
   	<title></title>
  -	<script language="javascript" type="text/javascript" src="../tabs.js"></script>
  +	<script language="javascript" type="text/javascript" src="tabs.js"></script>
       <xsl:call-template name="include-css">
         <xsl:with-param name="context-prefix" select="publish/context"/>
       </xsl:call-template>
  
  
  
  1.6       +31 -3     cocoon-lenya/src/webapp/lenya/xslt/info/root.xsl
  
  Index: root.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/xslt/info/root.xsl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- root.xsl	13 Jun 2003 18:15:52 -0000	1.5
  +++ root.xsl	16 Jun 2003 09:34:32 -0000	1.6
  @@ -34,7 +34,23 @@
      }
      #navigation { border: dotted 1px #CCCCCC; height: 600px; width: 200px; float: left; padding: 10px; margin: 2px; }
      #content { border: dotted 1px #CCCCCC; height: 600px; width: 700px; float: left; padding: 10px; margin: 2px;}
  -</style>
  +.contextmenu{
  +position:absolute;
  +width:150px;
  +border:3px ridge #C0C0C0;
  +background-color:#C0C0C0;
  +font-family:arial,helvetica,verdana;
  +font-size:12px;
  +font-style:normal;
  +font-weight:normal;
  +color:#000000;
  +line-height:18px;
  +cursor:hand;
  +z-index:1000;
  +visibility:hidden;}
  +.menuentry{
  +padding-left:10px;
  +text-align:left;}</style>
   
   
   <!-- SECTION 2: Replace everything (HTML, JavaScript, etc.) from here until the beginning 
  @@ -44,11 +60,23 @@
   <script src="ua.js"/>
   <script src="tree.js"/>
   <script src="output.js"/>
  +<!--<script src="contextmenu.js"/> -->
   </head>
   
   
   <!-- SECTION 4: Change the body tag to fit your site -->
   <body>
  +<div id="menucontainer" class="contextmenu" onMouseover="activate(event)" onMouseout="deactivate(event)" onClick="follow(event)" style="cursor:hand; display:none">
  +<div class="menuentry" url="javascript:window.history.go(-1);" target="_self" description="">Cut</div>
  +<div class="menuentry" url="javascript:window.history.go(1);" target="_self" description="">Copy</div>
  +<div class="menuentry" url="javascript:window.parent.external.AddFavorite(window.top.location.href,window.top.document.title);" target="_self" description="">Paste</div>
  +<hr/>
  +<div class="menuentry" url="javascript:window.parent.location.href=window.parent.location.href;" target="_self" description="">Rename</div>
  +<div class="menuentry" url="javascript:window.parent.location.href=window.parent.location.href;" target="_self" description="">Move Up</div>
  +<div class="menuentry" url="javascript:window.parent.location.href=window.parent.location.href;" target="_self" description="">Move Down</div>
  +<div class="menuentry" url="javascript:window.parent.location.href=window.parent.location.href;" target="_self" description="">Add Child Element</div>
  +<div class="menuentry" url="javascript:window.parent.location.href=window.parent.location.href;" target="_self" description="">Insert New Document</div>
  +</div>
   
   
   <!-- SECTION 5: Replace all the HTML from here until the beginning of SECTION 6 with the pieces of the head section that are needed for your site  -->
  @@ -66,7 +94,7 @@
   
   <!-- SECTION 7: Continuation of the body of the page, after the tree. Replace whole section with 
   your site's HTML. -->
  -</div><div id="content"><iframe src="tabs/info.xml" id="basefrm" name="basefrm" frameborder="0" width="100%" height="100%"></iframe></div>
  +</div><div id="content"><iframe src="" id="basefrm" name="basefrm" frameborder="0" width="100%" height="100%"></iframe></div>
   </body>
   </html>
   </xsl:template>
  
  
  
  1.6       +15 -0     cocoon-lenya/src/webapp/lenya/info.xmap
  
  Index: info.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/info.xmap,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- info.xmap	10 Jun 2003 17:10:20 -0000	1.5
  +++ info.xmap	16 Jun 2003 09:34:32 -0000	1.6
  @@ -11,6 +11,15 @@
       <map:actions/>
       <map:selectors/>
     </map:components>
  +  
  +  <map:resources>
  +    <map:resource name="style-cms-page">
  +      <map:transform src="xslt/util/page2xhtml.xsl">
  +        <map:parameter name="contextprefix" value="{request:contextPath}"/>
  +      </map:transform>
  +      <map:serialize/>
  +    </map:resource>
  +  </map:resources>
   
     <map:pipelines>
       <!-- Menus -->
  @@ -71,6 +80,12 @@
         </map:match>
       </map:pipeline>
   
  +    <map:pipeline>
  +      <map:match pattern="contextmenu.js">
  +	    <map:read src="resources/javascript/contextmenu.js"/>
  +	    <map:serialize type="text"/>
  +      </map:match>
  +    </map:pipeline>
       
       <map:pipeline>
         <map:match pattern="**">
  
  
  
  1.22      +1 -1      cocoon-lenya/src/webapp/lenya/usecase.xmap
  
  Index: usecase.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/usecase.xmap,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- usecase.xmap	14 Jun 2003 18:54:55 -0000	1.21
  +++ usecase.xmap	16 Jun 2003 09:34:32 -0000	1.22
  @@ -478,7 +478,7 @@
             <map:match pattern="showscreen" type="step">
               <map:generate src="content/info/info.xsp" type="serverpages"/>
               <map:transform src="xslt/info/info.xsl"/>
  -            <map:call resource="style-cms-page"/>
  +            <map:serialize type="html"/>
             </map:match>
             
             <map:match pattern="update" type="step">
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org