Changeset 5631


Ignore:
Timestamp:
18/08/09 15:53:04 (10 years ago)
Author:
cbyrom
Message:

Simplify and tidy up the configuration of the OAI Info editor +
remove some unecessary debugging code elsewhere in the controllers.

Location:
TI01-discovery/trunk/OAIInfoEditor
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • TI01-discovery/trunk/OAIInfoEditor/editor.config

    r5540 r5631  
    88baseurl:        /oai-editor-info 
    99 
     10# 
     11# the following is the server on which this browse/discovery instance runs! 
     12# NB, can only access this variable elsewhere in the config 
     13# file by defining it in the DEFAULT section 
     14server:         http://localhost:5000%(baseurl)s 
    1015 
    1116[SERVERS] 
    12 # 
    13 # the following is the server on which this browse/discovery instance runs! 
    14 server:         http://localhost:5000%(baseurl)s 
    1517 
    1618# SMTP server for sending mails - notifying when harvests have been ran 
     
    3133layout:          %(baseurl)s/layout/ 
    3234icondir:         %(baseurl)s/layout/icons/ 
     35jsdir:                   %(server)s/js/ 
    3336 
    3437ndgLink:        http://ndg.nerc.ac.uk/ 
     
    4144 
    4245yuiJavascript:  %(layout)sjs/yui/build/yui/yui-min.js 
    43 toggleJavascript: %(layout)sjs/toggleDiv.js 
    44 ndgJavascript:  %(layout)sndgJavascript.js 
    45 styleCss: %(layout)slayout/style/oai_editor_style.css  
    46 baseStyleCss: %(layout)slayout/style/base_style.css 
     46toggleJavascript: %(jsdir)stoggleDiv.js 
     47ndgJavascript:  %(jsdir)sndgJavascript.js 
     48styleCss: %(layout)sstyle/oai_editor_style.css  
  • TI01-discovery/trunk/OAIInfoEditor/oai_info_editor/config/oiemiddleware.py

    r5539 r5631  
    4141        self.globals.loadingIcon=cf.get('layout','loadingIcon') 
    4242         
    43         self.globals.yuiJavascript = cf.get('layout','yuiJavascript') 
     43        self.globals.server=cf.get('DEFAULT','server','') 
    4444        self.globals.toggleJavascript = cf.get('layout','toggleJavascript') 
    4545        self.globals.ndgJavascript = cf.get('layout','ndgJavascript') 
    4646        self.globals.styleCss = cf.get('layout','styleCss') 
    47         self.globals.baseStyleCss = cf.get('layout','baseStyleCss') 
    4847         
    49         self.globals.server=cf.get('SERVERS','server','') 
    5048        self.globals.proxy = cf.get('SERVERS','proxyServer') 
    5149        self.globals.mailServer = cf.get('SERVERS', 'mailserver') 
  • TI01-discovery/trunk/OAIInfoEditor/oai_info_editor/controllers/master.py

    r5539 r5631  
    111111        if url.startswith(g.baseUrl): 
    112112                        url = url.replace(g.baseUrl, '') 
    113                         logging.debug(" 2222222222222") 
    114                         logging.debug(url) 
    115113                         
    116114        h.redirect_to(g.server + url) 
  • TI01-discovery/trunk/OAIInfoEditor/oai_info_editor/templates/layout.html

    r5466 r5631  
    1111      </title> 
    1212                ${Markup(h.javascript_include_tag(builtins=True))} 
    13                 <script type="text/javascript" src="$g.server/js/yui/build/yui/yui-min.js" ></script>  
    14             <script type="text/javascript" src="$g.server/js/toggleDiv.js"/> 
    15         <script type="text/javascript" src="$g.server/js/ndgJavascript.js"/> 
    16         <link media="all, screen" href="$g.server/layout/style/oai_editor_style.css"  
    17                 type="text/css" rel="stylesheet"/> 
     13        <script type="text/javascript" src="$g.ndgJavascript" /> 
     14        <script type="text/javascript" src="$g.toggleJavascript"/> 
     15        <link media="all, screen" href="$g.styleCss" type="text/css" rel="stylesheet"/> 
    1816 
    1917                <!--! Include anything else specified in the parent template header --> 
  • TI01-discovery/trunk/OAIInfoEditor/oai_info_editor/templates/ndgPage.html

    r5539 r5631  
    77    <head py:def="pagehead()" py:strip="True"> 
    88        <title py:content="c.title">title</title> 
    9         <!--! The following includes the javascript, note that the XML 
    10         function is needed to avoid escaping the < character --> 
    11         ${Markup(h.javascript_include_tag(builtins=True))} 
    12         <script type="text/javascript" src="$g.toggleJavascript"/> 
    13         <link media="all, screen" href="$g.baseStyleCss" type="text/css" rel="stylesheet"/> 
    149    </head> 
    1510     
Note: See TracChangeset for help on using the changeset viewer.