Changeset 4837 for MILK


Ignore:
Timestamp:
19/01/09 10:32:49 (11 years ago)
Author:
cbyrom
Message:

Display more detail on deployments summary - providing clickable link
to deployment doc + properly enable debug mode on/off with boolean
string test + hide help text for atom state when in view mode + hide
link to help page when on help page - but display link to home page +
fix problem with text displayed on 'add selections' button - needed
to set explicit name for this to avoid htmlfill overwriting value
erroneously + remove unecessary package reference from setup.

Location:
MILK/trunk/milk_server
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • MILK/trunk/milk_server/milk_server/controllers/atom_editor/atomeditorcontroller.py

    r4798 r4837  
    109109 
    110110        errorMessage = e.message 
    111         if g.debugAtomEditor: 
     111        if g.debugAtomEditor == 'True': 
    112112            errorMessage = traceback.format_exc() 
    113113 
     
    171171        for key, val in inputs.items(): 
    172172            inputs[key] = str(val) 
    173      
     173 
    174174        return htmlfill.render(html, inputs) 
  • MILK/trunk/milk_server/milk_server/lib/ndgInterface.py

    r4798 r4837  
    7878        #unsecured discovery documents, these are called directly 
    7979        #in the retrieve controller! 
    80  
    8180        logging.info("Getting XML from uri, '%s' (outputschema: '%s')" \ 
    8281                     %(uri, outputSchema)) 
  • MILK/trunk/milk_server/milk_server/templates/atom_editor/atom_functions.html

    r4787 r4837  
    216216                            </span> 
    217217                            <tr> 
    218                         <td class="cellhead">Publication State:<span py:replace="helpIcon('pubState_help', 'tr')"/> 
     218                        <td class="cellhead">Publication State:<span py:if="c.editLink" py:replace="helpIcon('pubState_help', 'tr')"/> 
    219219                        </td> 
    220220                        <td py:if="editLink" class="column"> 
     
    437437         
    438438    <div py:def="FullDeployment(dep)" py:strip=""> 
    439                 <tr class="cellhead" colspan="2"><td> Start Date: ${dep.startDate or 'None'}, End Date: ${dep.endDate or 'None'}</td></tr> 
     439                <tr class="cellhead" colspan="2"> 
     440                <td>Title: <a href="${dep.browseURL}">${dep.title}</a></td> 
     441                </tr>            
     442                <tr class="cellhead" colspan="2"> 
     443                <td>Start Date: ${dep.startDate or 'None'}, End Date: ${dep.endDate or 'None'}</td></tr> 
    440444        <tr py:for="link in dep.getAllLinks()" > 
    441445        <?python 
  • MILK/trunk/milk_server/milk_server/templates/atom_editor/atom_list.html

    r4730 r4837  
    136136                                <td colspan = "6"/> 
    137137                                <td align="center"> 
    138                                 ${Markup(h.submit('Add selections', **{'onclick': 'Div_show("loading");'}))} 
     138                                ${Markup(h.submit('Add selections', name='add', **{'onclick': 'Div_show("loading");'}))} 
    139139                        </td></tr> 
    140140                        </table> 
  • MILK/trunk/milk_server/milk_server/templates/atom_editor/layout.html

    r4730 r4837  
    3939                        <tr><td align="left"> 
    4040                            <a href="${h.url_for('home')}">Home</a> 
    41                             </td><td align="right"><a href="${h.url_for('help')}">Help</a> 
     41                            </td><td align="right"><a py:if="c.title != HELP_PAGE_TITLE" href="${h.url_for('help')}">Help</a> 
    4242                            </td></tr> 
    4343                    </table> 
  • MILK/trunk/milk_server/setup.py

    r4798 r4837  
    1212    install_requires=["Pylons>=0.9.6",  
    1313                      "TurboKid",  
    14                       "ows_common",  
    1514                      "ndgCommon" 
    1615                      ], 
Note: See TracChangeset for help on using the changeset viewer.