Changeset 342


Ignore:
Timestamp:
Apr 14, 2010, 3:38:39 PM (9 years ago)
Author:
duh
Message:
  • restyled wizard tabs
  • made info and todo boxes only appear in development, not in production and test
Location:
trunk
Files:
2 added
1 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/views/layouts/main.gsp

    r311 r342  
    2626                ( style: <%=session.style%> )
    2727        </div>
    28         <g:render template="/common/feedback"/>
     28        <g:if env="development"><g:render template="/common/feedback"/></g:if>
    2929</div>
    3030</body>
  • trunk/grails-app/views/wizard/common/_tabs.gsp

    r299 r342  
    1616%>
    1717<div class="tabs">
    18   <g:each status="i" var="item" in="${pages}"><div class="element<g:if test="${(i == (page-1))}"> active</g:if>">${i+1}. ${item.title}</div></g:each>
     18 <ul>
     19  <g:each status="i" var="item" in="${pages}">
     20          <li<g:if test="${(i == (page-1))}"> class="active"</g:if>>
     21                <g:if test="${(i > 0)}"><img src="../images/wizard/arrowR.gif" align="absmiddle" class="arrow"></g:if><g:else>&nbsp;</g:else>
     22                <span class="content">${i+1}. ${item.title}</span>
     23                <g:if test="${(i < (pages.size() - 1))}"><img src="../images/wizard/arrowL.gif" align="absmiddle" class="arrow"></g:if><g:else>&nbsp;</g:else>
     24          </li>
     25  </g:each>
     26 </ul>
    1927</div>
  • trunk/grails-app/views/wizard/common/_wizard.gsp

    r299 r342  
    1616%>
    1717<div id="wizard" class="wizard">
    18         <h1>Create a new study</h1>
     18        <h1>Study capture wizard</h1>
    1919        <g:form action="pages" name="wizardForm" id="wizardForm">
    2020        <g:hiddenField name="do" value="" />
  • trunk/grails-app/views/wizard/pages/_confirmation.gsp

    r299 r342  
    7070</div>
    7171
    72 
     72<g:if env="development">
    7373<span class="info">
    7474        <span class="todo">TODO</span>
     
    7777        </ul>
    7878</span>
     79</g:if>
    7980
    8081</wizard:pageContent>
  • trunk/grails-app/views/wizard/pages/_eventDescriptions.gsp

    r299 r342  
    6161</g:if>
    6262
    63 
     63<g:if env="development">
    6464<span class="info">
    6565        <span class="todo">TODO</span>
     
    7575        </ul>
    7676</span>
     77</g:if>
    7778
    7879</wizard:pageContent>
  • trunk/grails-app/views/wizard/pages/_start.gsp

    r341 r342  
    2323        <wizard:ajaxButton name="modify" class="bigbutton" value="Modify an existing study" alt="Modify an existing study" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" />
    2424
     25        <g:if env="development">
    2526        <span class="info">
    2627                <span class="known">Known issues</span>
     
    3132                </ul>
    3233        </span>
    33 
    34         <!-- g:render template="pages/demo" //-->
     34        <!--g:render template="pages/demo"//-->
     35        </g:if>
    3536
    3637</wizard:pageContent>
  • trunk/grails-app/views/wizard/pages/_subjects.gsp

    r340 r342  
    6262</g:if>
    6363
     64        <g:if env="development">
    6465        <span class="info">
    6566                <span class="known">Known issues</span>
     
    7273                </ul>
    7374        </span>
     75        </g:if>
    7476
    7577</wizard:pageContent>
  • trunk/web-app/css/wizard.css

    r341 r342  
    6161}
    6262
     63/** START :: TABS **/
     64
    6365.wizard .tabs {
    6466    display: block;
    65     height: 18px;
    66     padding-top: 20px;
    67     background-color: #EEEEEE;
    68 }
    69 
    70 .wizard .tabs .element {
    71     background-color: #EEEEEE;
    72     border-bottom: 4px solid #006DBA;
    73     border-right: 1px solid #006DBA;
    74     color: #006DBA;
    75     cursor: default;
    76     display: inline;
     67    padding-bottom: 2px;
     68    border-bottom: 2px solid #006DBA;
     69    width: 100%;
     70}
     71.wizard .tabs ul {
     72    list-style-type: none; /* suppression of useless elements */
     73    padding: 0px;
     74    font-size: 10px;
     75    margin: 0px;
     76    font-family:Verdana, Arial, Helvetica, sans-serif;
    7777    font-size: 10px;
    7878    height: 20px;
    79     margin: 0px 0px 0px 0px;
    80     padding: 20px 15px 0px 15px;
     79    width: 100%;
     80}
     81.wizard .tabs img { border:0px; }
     82.wizard .tabs li {
     83    float: left;
     84    margin: 0px;
     85    height: 20px;
     86    float: left;
     87    display: block;
    8188    text-align: center;
    8289    text-decoration: none;
    83 }
    84 
     90    color: #006DBA;
     91    background: #CCC;
     92    font-weight: bold;
     93}
     94.wizard .tabs .content {
     95    padding: 0px 10px 0px 10px;
     96    display: inline;
     97    border: 0px;
     98}
    8599.wizard .tabs .active {
    86     background-color: #add9ee;
    87     color: #fff;
    88     font-weight: bold;
    89 }
     100    background-color: #006DBA !important;
     101    color: #fff !important;
     102}
     103.wizard .tabs .arrow {
     104                position:inherit;
     105                margin-top: 0px;
     106                margin-bottom: 0px;
     107                display:inline;
     108}
     109
     110/** END :: TABS **/
    90111
    91112.wizard .content {
    92113    display: block;
     114    padding-bottom: 10px;
     115    border-bottom: 2px solid #006DBA;   
    93116}
    94117
     
    97120    color: #666666;
    98121    font-size: 10px;
    99     padding-top: 10px;
    100122}
    101123
Note: See TracChangeset for help on using the changeset viewer.