Changeset 337


Ignore:
Timestamp:
01/10/12 14:50:19 (12 years ago)
Author:
vmipsl
Message:

clean

Location:
ether_2012/trunk
Files:
1 deleted
3 edited
1 copied
1 moved

Legend:

Unmodified
Added
Removed
  • ether_2012/trunk/ether.ipr

    r330 r337  
    22212221      <module fileurl="file://$PROJECT_DIR$/domain/Domain.iml" filepath="$PROJECT_DIR$/domain/Domain.iml" /> 
    22222222      <module fileurl="file://$PROJECT_DIR$/persistence/Persistence.iml" filepath="$PROJECT_DIR$/persistence/Persistence.iml" /> 
    2223       <module fileurl="file://$PROJECT_DIR$/Project_source.iml" filepath="$PROJECT_DIR$/Project_source.iml" /> 
    22242223      <module fileurl="file://$PROJECT_DIR$/service/Service.iml" filepath="$PROJECT_DIR$/service/Service.iml" /> 
    22252224      <module fileurl="file://$PROJECT_DIR$/web/Web.iml" filepath="$PROJECT_DIR$/web/Web.iml" /> 
     
    23102309          <value> 
    23112310            <SvnBranchConfiguration> 
    2312               <option name="trunkUrl" value="svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/ether/svn/project_source/trunk" /> 
     2311              <option name="branchMap"> 
     2312                <map> 
     2313                  <entry key="svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/ether/svn/ether_2012/trunk"> 
     2314                    <value> 
     2315                      <list> 
     2316                        <SvnBranchItem> 
     2317                          <option name="creationDateMillis" value="1326202344183" /> 
     2318                          <option name="revision" value="330" /> 
     2319                          <option name="url" value="svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/ether/svn/ether_2012/trunk/common" /> 
     2320                        </SvnBranchItem> 
     2321                        <SvnBranchItem> 
     2322                          <option name="creationDateMillis" value="1326202344183" /> 
     2323                          <option name="revision" value="330" /> 
     2324                          <option name="url" value="svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/ether/svn/ether_2012/trunk/domain" /> 
     2325                        </SvnBranchItem> 
     2326                        <SvnBranchItem> 
     2327                          <option name="creationDateMillis" value="1326202344183" /> 
     2328                          <option name="revision" value="330" /> 
     2329                          <option name="url" value="svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/ether/svn/ether_2012/trunk/persistence" /> 
     2330                        </SvnBranchItem> 
     2331                        <SvnBranchItem> 
     2332                          <option name="creationDateMillis" value="1326202344183" /> 
     2333                          <option name="revision" value="330" /> 
     2334                          <option name="url" value="svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/ether/svn/ether_2012/trunk/service" /> 
     2335                        </SvnBranchItem> 
     2336                        <SvnBranchItem> 
     2337                          <option name="creationDateMillis" value="1326202344183" /> 
     2338                          <option name="revision" value="330" /> 
     2339                          <option name="url" value="svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/ether/svn/ether_2012/trunk/sources" /> 
     2340                        </SvnBranchItem> 
     2341                        <SvnBranchItem> 
     2342                          <option name="creationDateMillis" value="1326202344183" /> 
     2343                          <option name="revision" value="330" /> 
     2344                          <option name="url" value="svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/ether/svn/ether_2012/trunk/tools" /> 
     2345                        </SvnBranchItem> 
     2346                        <SvnBranchItem> 
     2347                          <option name="creationDateMillis" value="1326202344183" /> 
     2348                          <option name="revision" value="330" /> 
     2349                          <option name="url" value="svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/ether/svn/ether_2012/trunk/web" /> 
     2350                        </SvnBranchItem> 
     2351                        <SvnBranchItem> 
     2352                          <option name="creationDateMillis" value="1326202344183" /> 
     2353                          <option name="revision" value="330" /> 
     2354                          <option name="url" value="svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/ether/svn/ether_2012/trunk/ether.iml" /> 
     2355                        </SvnBranchItem> 
     2356                        <SvnBranchItem> 
     2357                          <option name="creationDateMillis" value="1326202344183" /> 
     2358                          <option name="revision" value="330" /> 
     2359                          <option name="url" value="svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/ether/svn/ether_2012/trunk/ether.ipr" /> 
     2360                        </SvnBranchItem> 
     2361                        <SvnBranchItem> 
     2362                          <option name="creationDateMillis" value="1326202344183" /> 
     2363                          <option name="revision" value="330" /> 
     2364                          <option name="url" value="svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/ether/svn/ether_2012/trunk/ether.iws" /> 
     2365                        </SvnBranchItem> 
     2366                      </list> 
     2367                    </value> 
     2368                  </entry> 
     2369                </map> 
     2370              </option> 
     2371              <option name="branchUrls"> 
     2372                <list> 
     2373                  <option value="svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/ether/svn/ether_2012/trunk" /> 
     2374                </list> 
     2375              </option> 
     2376              <option name="trunkUrl" value="svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/ether/svn/ether_2012/trunk" /> 
    23132377            </SvnBranchConfiguration> 
    23142378          </value> 
  • ether_2012/trunk/ether.iws

    r336 r337  
    1616  <component name="ChangeListManager"> 
    1717    <list default="true" readonly="true" id="19090696-352b-4acf-ae79-b4145552009b" name="Default" comment=""> 
     18      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/web/init_sauv.jsp" /> 
     19      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/anytime.css" afterPath="" /> 
     20      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/.gitignore" afterPath="" /> 
     21      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/LICENSE" afterPath="" /> 
     22      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/ie.css" afterPath="" /> 
     23      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/buttons/readme.txt" afterPath="" /> 
     24      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/buttons/screen.css" afterPath="" /> 
     25      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/fancy-type/readme.txt" afterPath="" /> 
     26      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/fancy-type/screen.css" afterPath="" /> 
     27      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/link-icons/readme.txt" afterPath="" /> 
     28      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/link-icons/screen.css" afterPath="" /> 
     29      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/rtl/readme.txt" afterPath="" /> 
     30      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/rtl/screen.css" afterPath="" /> 
     31      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/print.css" afterPath="" /> 
     32      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/screen.css" afterPath="" /> 
     33      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/src/forms.css" afterPath="" /> 
     34      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/src/grid.css" afterPath="" /> 
     35      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/src/ie.css" afterPath="" /> 
     36      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/src/print.css" afterPath="" /> 
     37      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/src/reset.css" afterPath="" /> 
     38      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/src/typography.css" afterPath="" /> 
     39      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/blueprint/validate/COPYRIGHT.html" afterPath="" /> 
     40      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/blueprint/validate/README.html" afterPath="" /> 
     41      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/blueprint/validate/XERCES_COPYING.txt" afterPath="" /> 
     42      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/settings.example.yml" afterPath="" /> 
     43      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/tests/index.html" afterPath="" /> 
     44      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/tests/parts/elements.html" afterPath="" /> 
     45      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/tests/parts/forms.html" afterPath="" /> 
     46      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/tests/parts/grid.html" afterPath="" /> 
     47      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/tests/parts/sample.html" afterPath="" /> 
     48      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/button.css" afterPath="" /> 
     49      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/ether.css" afterPath="" /> 
     50      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/radio.css" afterPath="" /> 
     51      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/select.css" afterPath="" /> 
     52      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/js/Button.js" afterPath="" /> 
     53      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/js/Loading.js" afterPath="" /> 
     54      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/js/Radio.js" afterPath="" /> 
     55      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/js/Radio_sauv.js" afterPath="" /> 
     56      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/js/Select.js" afterPath="" /> 
     57      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/js/anytime.js" afterPath="" /> 
     58      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/js/jquery-1.4.2.min.js" afterPath="" /> 
     59      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/js/prototype.js" afterPath="" /> 
     60      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/visu_cathy-script.jsp" afterPath="" /> 
     61      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/visu_cathy.jsp" afterPath="" /> 
     62      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/AUTHORS.textile" afterPath="" /> 
     63      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/CHANGELOG" afterPath="" /> 
     64      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/README.textile" afterPath="" /> 
     65      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/TUTORIAL.textile" afterPath="" /> 
     66      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/buttons/icons/cross.png" afterPath="" /> 
     67      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/buttons/icons/key.png" afterPath="" /> 
     68      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/buttons/icons/tick.png" afterPath="" /> 
     69      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/buttons/icons" afterPath="" /> 
     70      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/buttons" afterPath="" /> 
     71      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/fancy-type" afterPath="" /> 
     72      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/link-icons/icons/doc.png" afterPath="" /> 
     73      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/link-icons/icons/email.png" afterPath="" /> 
     74      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/link-icons/icons/external.png" afterPath="" /> 
     75      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/link-icons/icons/feed.png" afterPath="" /> 
     76      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/link-icons/icons/im.png" afterPath="" /> 
     77      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/link-icons/icons/pdf.png" afterPath="" /> 
     78      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/link-icons/icons/visited.png" afterPath="" /> 
     79      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/link-icons/icons/xls.png" afterPath="" /> 
     80      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/link-icons/icons" afterPath="" /> 
     81      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/link-icons" afterPath="" /> 
     82      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins/rtl" afterPath="" /> 
     83      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/plugins" afterPath="" /> 
     84      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/src/grid.png" afterPath="" /> 
     85      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint/src" afterPath="" /> 
     86      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/blueprint" afterPath="" /> 
     87      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/blueprint/blueprint.rb" afterPath="" /> 
     88      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/blueprint/compressor.rb" afterPath="" /> 
     89      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/blueprint/core_ext.rb" afterPath="" /> 
     90      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/blueprint/css_parser.rb" afterPath="" /> 
     91      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/blueprint/custom_layout.rb" afterPath="" /> 
     92      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/blueprint/grid.css.erb" afterPath="" /> 
     93      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/blueprint/grid_builder.rb" afterPath="" /> 
     94      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/blueprint/namespace.rb" afterPath="" /> 
     95      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/blueprint/semantic_class_names.rb" afterPath="" /> 
     96      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/blueprint/validate/JIGSAW_COPYRIGHT" afterPath="" /> 
     97      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/blueprint/validate/css-validator-javadoc.jar" afterPath="" /> 
     98      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/blueprint/validate/css-validator.jar" afterPath="" /> 
     99      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/blueprint/validate/jigsaw.jar" afterPath="" /> 
     100      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/blueprint/validate/xerces.jar" afterPath="" /> 
     101      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/blueprint/validate" afterPath="" /> 
     102      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/blueprint/validator.rb" afterPath="" /> 
     103      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/blueprint" afterPath="" /> 
     104      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/compress.rb" afterPath="" /> 
     105      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib/validate.rb" afterPath="" /> 
     106      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/lib" afterPath="" /> 
     107      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/templates/psd/fixed-width.psd" afterPath="" /> 
     108      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/templates/psd" afterPath="" /> 
     109      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/templates" afterPath="" /> 
     110      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/tests/parts/test-small.jpg" afterPath="" /> 
     111      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/tests/parts/test.jpg" afterPath="" /> 
     112      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/tests/parts/valid.png" afterPath="" /> 
     113      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/tests/parts" afterPath="" /> 
     114      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css/tests" afterPath="" /> 
     115      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css/blueprint-css" afterPath="" /> 
     116      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/css" afterPath="" /> 
     117      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/images/loading.gif" afterPath="" /> 
     118      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/images/radio_off.gif" afterPath="" /> 
     119      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/images/radio_on.gif" afterPath="" /> 
     120      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/images/select_left.gif" afterPath="" /> 
     121      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/images/select_middle.gif" afterPath="" /> 
     122      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/images/select_right.gif" afterPath="" /> 
     123      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/images" afterPath="" /> 
     124      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy/js" afterPath="" /> 
     125      <change type="DELETED" beforePath="$PROJECT_DIR$/web/cathy" afterPath="" /> 
     126      <change type="MOVED" beforePath="$PROJECT_DIR$/web/resources/template/templateMegapoli.jsp" afterPath="$PROJECT_DIR$/web/resources/template/templateEther.jsp" /> 
     127      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ether.ipr" afterPath="$PROJECT_DIR$/ether.ipr" /> 
    18128      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ether.iws" afterPath="$PROJECT_DIR$/ether.iws" /> 
     129      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/web/init.jsp" afterPath="$PROJECT_DIR$/web/init.jsp" /> 
    19130    </list> 
    20131    <list id="e7c09dc9-40b6-46cf-b964-8f5f3ec37c23" name="Not To Commit" comment="" /> 
     
    94205  <component name="FileEditorManager"> 
    95206    <leaf> 
    96       <file leaf-file-name="visu.jsp" pinned="false" current="true" current-in-tab="true"> 
     207      <file leaf-file-name="visu.jsp" pinned="false" current="false" current-in-tab="false"> 
    97208        <entry file="file://$PROJECT_DIR$/web/visualization/visu.jsp"> 
     209          <provider selected="true" editor-type-id="text-editor"> 
     210            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0"> 
     211              <folding /> 
     212            </state> 
     213          </provider> 
     214        </entry> 
     215      </file> 
     216      <file leaf-file-name="templateEther.jsp" pinned="false" current="false" current-in-tab="false"> 
     217        <entry file="file://$PROJECT_DIR$/web/resources/template/templateEther.jsp"> 
     218          <provider selected="true" editor-type-id="text-editor"> 
     219            <state line="19" column="59" selection-start="917" selection-end="917" vertical-scroll-proportion="-5.8163266"> 
     220              <folding /> 
     221            </state> 
     222          </provider> 
     223        </entry> 
     224      </file> 
     225      <file leaf-file-name="init.jsp" pinned="false" current="true" current-in-tab="true"> 
     226        <entry file="file://$PROJECT_DIR$/web/init.jsp"> 
     227          <provider selected="true" editor-type-id="text-editor"> 
     228            <state line="4" column="54" selection-start="225" selection-end="225" vertical-scroll-proportion="0.13215859"> 
     229              <folding /> 
     230            </state> 
     231          </provider> 
     232        </entry> 
     233      </file> 
     234      <file leaf-file-name="init_sauv.jsp" pinned="false" current="false" current-in-tab="false"> 
     235        <entry file="file://$PROJECT_DIR$/web/init_sauv.jsp"> 
    98236          <provider selected="true" editor-type-id="text-editor"> 
    99237            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> 
     
    130268        <option value="$PROJECT_DIR$/web/visualization/visu.jsp" /> 
    131269        <option value="$PROJECT_DIR$/web/src/messages_en.properties" /> 
    132         <option value="$PROJECT_DIR$/web/init.jsp" /> 
    133270        <option value="$PROJECT_DIR$/web/resources/js/autocomplete/index.html" /> 
    134271        <option value="$PROJECT_DIR$/web/resources/js/autocomplete/response.php" /> 
     272        <option value="$PROJECT_DIR$/web/init.jsp" /> 
    135273      </list> 
    136274    </option> 
     
    207345            </PATH_ELEMENT> 
    208346            <PATH_ELEMENT> 
    209               <option name="myItemId" value="visualization" /> 
     347              <option name="myItemId" value="WEB-INF" /> 
     348              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 
     349            </PATH_ELEMENT> 
     350          </PATH> 
     351          <PATH> 
     352            <PATH_ELEMENT> 
     353              <option name="myItemId" value="ether" /> 
     354              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> 
     355            </PATH_ELEMENT> 
     356            <PATH_ELEMENT> 
     357              <option name="myItemId" value="web" /> 
     358              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 
     359            </PATH_ELEMENT> 
     360            <PATH_ELEMENT> 
     361              <option name="myItemId" value="resources" /> 
     362              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 
     363            </PATH_ELEMENT> 
     364            <PATH_ELEMENT> 
     365              <option name="myItemId" value="template" /> 
     366              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 
     367            </PATH_ELEMENT> 
     368          </PATH> 
     369          <PATH> 
     370            <PATH_ELEMENT> 
     371              <option name="myItemId" value="ether" /> 
     372              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> 
     373            </PATH_ELEMENT> 
     374            <PATH_ELEMENT> 
     375              <option name="myItemId" value="web" /> 
     376              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 
     377            </PATH_ELEMENT> 
     378            <PATH_ELEMENT> 
     379              <option name="myItemId" value="resources" /> 
    210380              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 
    211381            </PATH_ELEMENT> 
     
    219389  <component name="PropertiesComponent"> 
    220390    <property name="GoToFile.includeJavaFiles" value="false" /> 
    221     <property name="project.structure.last.edited" value="Modules" /> 
     391    <property name="project.structure.last.edited" value="Artifacts" /> 
    222392    <property name="project.structure.proportion" value="0.09811617" /> 
    223393    <property name="options.splitter.main.proportions" value="0.3" /> 
     
    243413    </key> 
    244414    <key name="CopyFile.RECENT_KEYS"> 
     415      <recent name="$PROJECT_DIR$/web" /> 
    245416      <recent name="$PROJECT_DIR$/web/resources/template" /> 
    246417      <recent name="$PROJECT_DIR$/web/cathy/js" /> 
    247418      <recent name="$PROJECT_DIR$/web/cathy/css" /> 
    248419      <recent name="$PROJECT_DIR$/web/cathy/images" /> 
    249       <recent name="$PROJECT_DIR$/web/cathy" /> 
    250420    </key> 
    251421  </component> 
     
    350520      </method> 
    351521    </configuration> 
     522    <configuration default="true" type="JavascriptDebugSession" factoryName="Remote"> 
     523      <JSRemoteDebuggerConfigurationSettings> 
     524        <option name="engineId" /> 
     525        <option name="fileUrl" /> 
     526      </JSRemoteDebuggerConfigurationSettings> 
     527      <method> 
     528        <option name="AntTarget" enabled="false" /> 
     529        <option name="BuildArtifacts" enabled="false" /> 
     530        <option name="Maven.BeforeRunTask" enabled="false" /> 
     531      </method> 
     532    </configuration> 
    352533    <configuration default="true" type="JUnit" factoryName="JUnit"> 
    353534      <extension name="coverage" enabled="false" merge="false" /> 
     
    486667    <editor active="false" /> 
    487668    <layout> 
    488       <window_info id="Changes" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21470246" sideWeight="0.0" order="7" side_tool="false" content_ui="tabs" /> 
     669      <window_info id="Changes" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.40956825" sideWeight="0.0" order="7" side_tool="false" content_ui="tabs" /> 
    489670      <window_info id="Persistence" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> 
    490671      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 
     
    501682      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 
    502683      <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 
    503       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21717791" sideWeight="0.7852976" order="0" side_tool="false" content_ui="tabs" /> 
     684      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19018404" sideWeight="0.59043175" order="0" side_tool="false" content_ui="tabs" /> 
    504685      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3293979" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 
    505686      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> 
     
    527708    <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" /> 
    528709    <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> 
    529     <option name="LAST_COMMIT_MESSAGE" value="Import du projet Ether pour le nouveau look 2012" /> 
     710    <option name="LAST_COMMIT_MESSAGE" value="clean" /> 
    530711    <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" /> 
    531712    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> 
     
    546727    <MESSAGE value="Test svn" /> 
    547728    <MESSAGE value="Import du projet Ether pour le nouveau look 2012" /> 
     729    <MESSAGE value="test" /> 
     730    <MESSAGE value="clean" /> 
    548731  </component> 
    549732  <component name="VssConfiguration"> 
     
    592775      <provider selected="true" editor-type-id="text-editor"> 
    593776        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> 
     777          <folding /> 
     778        </state> 
     779      </provider> 
     780    </entry> 
     781    <entry file="file://$PROJECT_DIR$/web/index.jsp"> 
     782      <provider selected="true" editor-type-id="text-editor"> 
     783        <state line="1" column="61" selection-start="125" selection-end="125" vertical-scroll-proportion="0.025597269"> 
     784          <folding /> 
     785        </state> 
     786      </provider> 
     787    </entry> 
     788    <entry file="file://$PROJECT_DIR$/web/init_sauv.jsp"> 
     789      <provider selected="true" editor-type-id="text-editor"> 
     790        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> 
     791          <folding /> 
     792        </state> 
     793      </provider> 
     794    </entry> 
     795    <entry file="file://$PROJECT_DIR$/web/resources/template/templateEther.jsp"> 
     796      <provider selected="true" editor-type-id="text-editor"> 
     797        <state line="19" column="59" selection-start="917" selection-end="917" vertical-scroll-proportion="-5.8163266"> 
     798          <folding /> 
     799        </state> 
     800      </provider> 
     801    </entry> 
     802    <entry file="file://$PROJECT_DIR$/web/init.jsp"> 
     803      <provider selected="true" editor-type-id="text-editor"> 
     804        <state line="4" column="54" selection-start="225" selection-end="225" vertical-scroll-proportion="0.13215859"> 
    594805          <folding /> 
    595806        </state> 
  • ether_2012/trunk/web/init.jsp

    r330 r337  
    1 <%@ page import="com.ether.Context" %> 
    2 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> 
    3 <%@ page contentType="text/html;charset=UTF-8" language="java" %> 
     1<%@ page contentType="text/html; charset=UTF-8" %> 
     2<%@ page language="java" contentType="text/html; charset=UTF-8" %> 
     3<%@ taglib prefix="ether" tagdir="/WEB-INF/tags" %> 
    44 
    5 <html> 
    6 <head> 
    7     <meta http-equiv="content-type" content="text/html; charset=iso-8859-1"> 
    8     <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE"> 
     5<tiles:insert page="/resources/templates/templateEther.jsp" flush="true"> 
    96 
    10     <script src="resources/js/autocomplete/javascript/prototype.js" type="text/javascript"></script> 
    11     <script src="resources/js/autocomplete/javascript/effects.js" type="text/javascript"></script> 
    12     <script src="resources/js/autocomplete/javascript/controls.js" type="text/javascript"></script> 
    13     <link rel="stylesheet" href="resources/css/autocomplete/style.css" type="text/css"/> 
     7    <tiles:put name="insertCss" type="string"></tiles:put> 
     8    <tiles:put name="insertJsOrJsp" type="string"></tiles:put> 
    149 
    1510 
    16     <title>Project source</title> 
    17 </head> 
    18  
    19 <body> 
     11    <tiles:put name="title" type="string"><bean:message key="app.title"/> - <bean:message key="data"/></tiles:put> 
     12    <tiles:put name="nav" type="string"><html:link page="/index.jsp"><bean:message key="app.home"/></html:link></tiles:put> 
    2013 
    2114 
    22 <%=Context.getLocale( request )%> 
     15    <%-- ****************** CONTENT ****************** --%> 
     16    <tiles:put name="bodytitle" type="string"><bean:message key="data.title"/></tiles:put> 
    2317 
    24 <spring:message code="label.language" htmlEscape="true"/> : <spring:message code="language" htmlEscape="true"/> 
     18    <tiles:put name="body" type="string"> 
     19        <bean:message key="data.intro0"/> 
     20        <bean:message key="data.intro1"/><html:link href="mailto:${webmaster}?subject=[MEGAPOLI]">webmaster</html:link>. 
     21        <bean:define id="upload" value="upload"/> 
     22        <bean:define id="access" value="access"/> 
     23        <ul> 
     24            <li> 
     25                <html:link page="/data/catalogResume.jsp"><bean:message key="data.access"/></html:link>: <bean:message key="data.access.intro"/> 
     26            </li> 
     27            <li> 
     28                <a onclick='javascript:neededLogin("/DataAccess.do")'><bean:message key="data.access.extract"/></a> : <bean:message key="data.access.intro2"/> 
     29            </li> 
     30            <li> 
     31                <a onclick='javascript:neededLogin("/PrepareTree.do")'><bean:message key="data.upload"/></a> : <bean:message key="data.upload.intro"/> 
     32            </li> 
     33        </ul> 
     34    </tiles:put> 
    2535 
    26 <br/><br/> 
    27  
    28 <spring:message code="text.change.language" htmlEscape="true"/> 
    29 <br/> 
    30 <spring:message code="label.language" htmlEscape="true"/> : <a 
    31         href="visualization?methodName=home&language=en"><spring:message code="label.language.en" 
    32                                                                          htmlEscape="true"/></a> 
    33 | <a href="visualization?methodName=home&language=fr"><spring:message code="label.language.fr" htmlEscape="true"/></a> 
    34  
    35 <hr> 
    36 <h3><spring:message code="titre.init" htmlEscape="true"/></h3> 
    37 <hr> 
    38  
    39 <table width="100%"> 
    40     <tr> 
    41         <td> 
    42             <a href="visualization?methodName=view"><spring:message code="text.visu.href" htmlEscape="true"/></a> 
    43         </td> 
    44         <td><spring:message code="text.visu" htmlEscape="true"/></td> 
    45     </tr> 
    46  
    47     <tr> 
    48         <td> 
    49             <a href="visualization?methodName=viewAllPlateforms"><spring:message code="text.visu.pf.href" 
    50                                                                                  htmlEscape="true"/></a> 
    51         </td> 
    52         <td><spring:message code="text.visu.pf" htmlEscape="true"/></td> 
    53     </tr> 
    54  
    55 </table> 
    56  
    57 <BR/><BR/> 
    58 <hr> 
    59 <h3>Auto-completion</h3> 
    60 <hr> 
    61  
    62 <div id="container"> 
    63     <form method="get" action=""> 
    64         <label for="testinput">Search for a country name</label><br/> 
    65         <input type="text" id="search" name="search" autocomplete="off" class="input" value=""/><br/> 
    66  
    67         <div id="update" style="display: none; position:relative;"></div> 
    68         <input type="image" name="register" class="submit-btn" src="http://www.roscripts.com/images/btn.gif" 
    69                alt="submit" title="submit"/> 
    70     </form> 
    71  
    72     <script type="text/javascript"> 
    73         new Ajax.Autocompleter( 'search', 'update', 'response.php', { tokens: ','} ); 
    74     </script> 
    75 </div> 
    76  
    77 </body> 
    78 </html> 
     36</tiles:insert> 
  • ether_2012/trunk/web/init_sauv.jsp

    r335 r337  
    1 <%@ page import="com.ether.Context" %> 
    2 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> 
    3 <%@ page contentType="text/html;charset=UTF-8" language="java" %> 
    4  
    5 <html> 
    6 <head> 
    7     <meta http-equiv="content-type" content="text/html; charset=iso-8859-1"> 
    8     <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE"> 
    9  
    10     <script src="resources/js/autocomplete/javascript/prototype.js" type="text/javascript"></script> 
    11     <script src="resources/js/autocomplete/javascript/effects.js" type="text/javascript"></script> 
    12     <script src="resources/js/autocomplete/javascript/controls.js" type="text/javascript"></script> 
    13     <link rel="stylesheet" href="resources/css/autocomplete/style.css" type="text/css"/> 
    14  
    15  
    16     <title>Project source</title> 
    17 </head> 
    18  
    19 <body> 
    20  
    21  
    22 <%=Context.getLocale( request )%> 
    23  
    24 <spring:message code="label.language" htmlEscape="true"/> : <spring:message code="language" htmlEscape="true"/> 
    25  
    26 <br/><br/> 
    27  
    28 <spring:message code="text.change.language" htmlEscape="true"/> 
    29 <br/> 
    30 <spring:message code="label.language" htmlEscape="true"/> : <a 
    31         href="visualization?methodName=home&language=en"><spring:message code="label.language.en" 
    32                                                                          htmlEscape="true"/></a> 
    33 | <a href="visualization?methodName=home&language=fr"><spring:message code="label.language.fr" htmlEscape="true"/></a> 
    34  
    35 <hr> 
    36 <h3><spring:message code="titre.init" htmlEscape="true"/></h3> 
    37 <hr> 
    38  
    39 <table width="100%"> 
    40     <tr> 
    41         <td> 
    42             <a href="visualization?methodName=view"><spring:message code="text.visu.href" htmlEscape="true"/></a> 
    43         </td> 
    44         <td><spring:message code="text.visu" htmlEscape="true"/></td> 
    45     </tr> 
    46  
    47     <tr> 
    48         <td> 
    49             <a href="visualization?methodName=viewAllPlateforms"><spring:message code="text.visu.pf.href" 
    50                                                                                  htmlEscape="true"/></a> 
    51         </td> 
    52         <td><spring:message code="text.visu.pf" htmlEscape="true"/></td> 
    53     </tr> 
    54  
    55 </table> 
    56  
    57 <BR/><BR/> 
    58 <hr> 
    59 <h3>Auto-completion</h3> 
    60 <hr> 
    61  
    62 <div id="container"> 
    63     <form method="get" action=""> 
    64         <label for="testinput">Search for a country name</label><br/> 
    65         <input type="text" id="search" name="search" autocomplete="off" class="input" value=""/><br/> 
    66  
    67         <div id="update" style="display: none; position:relative;"></div> 
    68         <input type="image" name="register" class="submit-btn" src="http://www.roscripts.com/images/btn.gif" 
    69                alt="submit" title="submit"/> 
    70     </form> 
    71  
    72     <script type="text/javascript"> 
    73         new Ajax.Autocompleter( 'search', 'update', 'response.php', { tokens: ','} ); 
    74     </script> 
    75 </div> 
    76  
    77 </body> 
    78 </html> 
Note: See TracChangeset for help on using the changeset viewer.