Changeset 996 for trunk/grails-app/views


Ignore:
Timestamp:
Oct 26, 2010, 3:19:22 PM (11 years ago)
Author:
robert@…
Message:

Implemented clone feature in template editor (ticket #6), added a rest call 'getUser' and added webflow to the application.properties again.

Location:
trunk/grails-app/views
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/views/templateEditor/elements/_liTemplateEditable.gsp

    r980 r996  
    22  <img onClick="editTemplate( ${template.id} );" src="${createLinkTo( dir: 'images/icons', file: 'application_edit.png', plugin: 'famfamfam' )}" alt="Edit template properties" title="Edit template properties">
    33  <img onClick="editFields( ${template.id} );"src="${createLinkTo( dir: 'images/icons', file: 'application_form.png', plugin: 'famfamfam' )}" alt="Add/remove template fields" title="Add/remove template fields">
     4  <img onClick="cloneTemplate( ${template.id} );"src="${createLinkTo( dir: 'images/icons', file: 'page_copy.png', plugin: 'famfamfam' )}" alt="Clone this template" title="Clone this template">
    45  <img onClick="if( confirm( 'Are you sure?' ) ) { deleteTemplate( ${template.id} ); }" src="${createLinkTo( dir: 'images/icons', file: 'delete.png', plugin: 'famfamfam' )}" alt="Delete this template" title="Delete this template">
    56</span>
  • trunk/grails-app/views/templateEditor/elements/_liTemplateNonEditable.gsp

    r980 r996  
    33  <img onClick="editTemplate( ${template.id} );" src="${createLinkTo( dir: 'images/icons', file: 'application_edit.png', plugin: 'famfamfam' )}" alt="Edit template properties" title="Edit template properties">
    44  <img onClick="editFields( ${template.id} );"src="${createLinkTo( dir: 'images/icons', file: 'application_form.png', plugin: 'famfamfam' )}" alt="Add/remove template fields" title="Add/remove template fields">
     5  <img onClick="cloneTemplate( ${template.id} );"src="${createLinkTo( dir: 'images/icons', file: 'page_copy.png', plugin: 'famfamfam' )}" alt="Clone this template" title="Clone this template">
    56  <img class="disabled" src="${createLinkTo( dir: 'images/icons', file: 'delete.png', plugin: 'famfamfam' )}" alt="Deleting this template is not possible. Template is used in ${numUses} objects." title="Deleting this template is not possible. Template is used in ${numUses} objects.">
    67</span>
  • trunk/grails-app/views/templateEditor/index.gsp

    r959 r996  
    5959                </div>
    6060
     61                <div id="wait" class="wait">
     62                  &nbsp;
     63                </div>
     64                <div class="wait_text wait">
     65                  <img src="<g:resource dir="images" file="spinner.gif" />"> Please wait
     66                </div>
     67
     68
    6169        </body>
    6270</html>
  • trunk/grails-app/views/templateEditor/template.gsp

    r959 r996  
    8888                                <ol id="selectedTemplateFields" class="templateFields <g:if test="${template.inUse()}">inUse</g:if>">
    8989                                        <g:render template="elements/selected" var="templateField" collection="${template.fields}" model="['template':template]"/>
     90                                        <% /* NB: this empty field should always be the last in the list! */ %>
    9091                                        <li class="empty ui-state-default" <g:if test="${template.fields?.size() > 0 }">style='display: none;'</g:if>>This template does not yet contain any fields. Drag a field to this list or use the 'Add field button'.</li>
    9192                                </ol>
     
    9697                                <p>These fields are available for adding to the template. Drag a field to the template to add it.</p>
    9798                                <ol id="availableTemplateFields" class="templateFields">
     99                                        <g:render template="elements/available" var="templateField" collection="${allFields - template.fields}" />
    98100                                        <li class="empty ui-state-default" <g:if test="${allFields.size() > template.fields.size()}">style='display: none;'</g:if>>There are no additional fields that can be added. Use the 'Create new field' button to create new fields.</li>
    99                                         <g:render template="elements/available" var="templateField" collection="${allFields - template.fields}" />
    100101                                </ol>
    101102
     
    121122                </div>
    122123
    123         </body>
     124                <div id="wait" class="wait">
     125                  &nbsp;
     126                </div>
     127                <div class="wait_text wait">
     128                  <img src="<g:resource dir="images" file="spinner.gif" />"> Please wait
     129                </div>
     130                </body>
    124131</html>
  • trunk/grails-app/views/user/create.gsp

    r985 r996  
    1010      });
    1111    </script>
     12        <style type="text/css">
     13          div.usermanagement { font-size: 0.8em; }
     14        </style>
    1215</head>
    1316
     
    1821<g:form action="save" name='userCreateForm' class="button-style">
    1922
    20       <div id="tabs">
     23      <div id="tabs" class="usermanagement">
    2124        <ul>
    2225          <li><a href="#userinfo">User info</a></li>
     
    5457  <input type="submit" value="Save" />
    5558
    56   <g:if test='${user}'>
    57         DELETE
    58   </g:if>
    59 
    6059</div>
    6160
    6261</g:form>
    63 
    64 <g:if test='${user}'>
    65   deleteform
    66 </g:if>
    6762
    6863<script>
  • trunk/grails-app/views/user/edit.gsp

    r985 r996  
    1010      });
    1111    </script>
     12        <style type="text/css">
     13          div.usermanagement { font-size: 0.8em; }
     14        </style>
    1215</head>
    1316
     
    2023<g:hiddenField name="version" value="${user?.version}"/>
    2124
    22       <div id="tabs">
     25      <div id="tabs" class="usermanagement">
    2326        <ul>
    2427          <li><a href="#userinfo">User info</a></li>
     
    5760
    5861  <g:if test='${user}'>
    59         DELETE
     62    <input type="button" value="Delete" onClick="$('#userDeleteForm').submit(); return false;"/>
    6063  </g:if>
    6164
     
    6568
    6669<g:if test='${user}'>
    67   deleteform
     70  <g:form action="delete" name='userDeleteForm'>
     71        <g:hiddenField name="id" value="${user?.id}"/>
     72  </g:form>
    6873</g:if>
    6974
  • trunk/grails-app/views/user/search.gsp

    r985 r996  
    1010        <g:form action='userSearch' name='userSearchForm'>
    1111
     12                <g:if test="${flash.message}">
     13                  <p>
     14                        ${flash.message}
     15                  </p>
     16                </g:if>
    1217                <br/>
    1318
Note: See TracChangeset for help on using the changeset viewer.