Changeset 1637

Show
Ignore:
Timestamp:
06/19/08 14:13:29 (2 months ago)
Author:
mikey
Message:

reorganize build for pulti-projects
move javascript and stage assistant to project common

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/stubbles/build.xml

    r1636 r1637  
    4545 
    4646    <mkdir dir="${build.src.dir}/projects" /> 
    47     <mkdir dir="${build.src.dir}/projects/dist/cache" /> 
    48  
     47    <copy todir="${build.src.dir}/projects/common"> 
     48    <fileset dir="${stubbles.base.dir}/projects/common"> 
     49        <include name="**/*"/> 
     50        <exclude name="**/Thumbs.db"/> 
     51      </fileset> 
     52    </copy> 
    4953    <copy todir="${build.src.dir}/projects/dist"> 
    5054      <fileset dir="${stubbles.base.dir}/projects/dist"> 
    …… 
    6064    </copy> 
    6165 
    62     <mkdir dir="${build.src.dir}/projects/dist/docroot/javascript"/> 
    63     <copy todir="${build.src.dir}/projects/dist/docroot/javascript"> 
     66    <mkdir dir="${build.src.dir}/projects/common/docroot/javascript"/> 
     67    <copy todir="${build.src.dir}/projects/common/docroot/javascript"> 
    6468      <fileset dir="${stubbles.base.dir}/src/main/javascript"> 
    6569        <include name="**/*.js"/> 
    …… 
    137141    <echo>| Minify javascript to release |</echo> 
    138142    <echo>--------------------------------</echo> 
    139     <minifyJs targetDir="${build.src.dir}/projects/dist/docroot/javascript" 
     143    <minifyJs targetDir="${build.src.dir}/projects/common/docroot/javascript" 
    140144              jsMinPath="${stubbles.base.dir}/lib/jsmin-1.1.0.php"> 
    141145      <fileset dir="${stubbles.base.dir}/src/main/javascript"> 

  • trunk/projects/common/docroot/stageassistant/css/stageassistant.css

    r1561 r1637  
    77  height: 113px; 
    88  z-index: 1001; 
    9   background: url(/stageassistant/img/bg.gif) no-repeat; 
     9  background: url(/common/stageassistant/img/bg.gif) no-repeat; 
    1010} 
    1111 
    …… 
    2828  height: 26px; 
    2929  z-index: 1001; 
    30   background: url(/stageassistant/img/min.gif) no-repeat; 
     30  background: url(/common/stageassistant/img/min.gif) no-repeat; 
    3131} 
    3232 
    …… 
    7777#stageassistant .bottom { 
    7878  font-size: 1px; 
    79   background: url(/stageassistant/img/bottom.gif) no-repeat; 
     79  background: url(/common/stageassistant/img/bottom.gif) no-repeat; 
    8080  width: 213px; 
    8181  height: 6px; 

  • trunk/src/main/resources/xsl/stub.xsl

    r1626 r1637  
    542542      <ixsl:if test="/document/mode/name = 'DEV' or /document/mode/name = 'STAGE'"> 
    543543        <div id="stageassistant"> 
    544           <a href="#" id="sa_close" onclick="stageAssistant.close(); return false;"><img src="/stageassistant/img/close.gif" width="15" height="15" alt="Close"/></a> 
    545           <a href="#" id="sa_minimize" onclick="stageAssistant.minimize(); return false;"><img src="/stageassistant/img/minimize.gif" width="15" height="15" alt="Minimize"/></a> 
     544          <a href="#" id="sa_close" onclick="stageAssistant.close(); return false;"><img src="/common/stageassistant/img/close.gif" width="15" height="15" alt="Close"/></a> 
     545          <a href="#" id="sa_minimize" onclick="stageAssistant.minimize(); return false;"><img src="/common/stageassistant/img/minimize.gif" width="15" height="15" alt="Minimize"/></a> 
    546546          <div class="content"> 
    547547            <div id="sa_ec"> 
    548548              <div class="buttons"> 
    549                 <a href="?showLastRequestXML=1" target="xmlSource"><img src="/stageassistant/img/b_domtree.gif" width="52" height="44" alt="View DOM tree"/></a> 
     549                <a href="?showLastRequestXML=1" target="xmlSource"><img src="/common/stageassistant/img/b_domtree.gif" width="52" height="44" alt="View DOM tree"/></a> 
    550550              </div> 
    551551            </div> 
    …… 
    558558        </div> 
    559559        <div id="stageassistant_min"> 
    560           <a href="#" id="sa_close_min" onclick="stageAssistant.close(); return false;"><img src="/stageassistant/img/close.gif" width="15" height="15" alt="Close"/></a> 
    561           <a href="#" id="sa_open" onclick="stageAssistant.open(); return false;"><img src="/stageassistant/img/open.gif" width="15" height="15" alt="Open"/></a> 
     560          <a href="#" id="sa_close_min" onclick="stageAssistant.close(); return false;"><img src="/common/stageassistant/img/close.gif" width="15" height="15" alt="Close"/></a> 
     561          <a href="#" id="sa_open" onclick="stageAssistant.open(); return false;"><img src="/common/stageassistant/img/open.gif" width="15" height="15" alt="Open"/></a> 
    562562        </div> 
    563563        <script type="text/javascript">