Changeset 1747

Timestamp:

06.12.2011 21:51:00 (6 months ago)

Author:

zmsdev

Message:

minor fixes for zmi

Location:

ZMS/trunk

Files:

• _confmanager.py (modified) (1 diff)
• _globals.py (modified) (3 diffs)
• dtml/ZMS/headcstylesheet.dtml (modified) (1 diff)
• dtml/ZMS/manage_customize.dtml (modified) (1 diff)
• dtml/ZMS/manage_customizedesignform.dtml (modified) (4 diffs)
• dtml/ZMS/manage_editorform.dtml (modified) (2 diffs)
• dtml/ZMSContainerObject/sitemap/version0.dtml (modified) (1 diff)
• dtml/versionmanager/manage_tasks.dtml (modified) (1 diff)
• zmsobject.py (modified) (1 diff)

ZMS/trunk/_confmanager.py

@@ -804 +804 @@
       cssId = REQUEST.get('cssId','')
       
-      # Insert.
-      # -------
-      if btn == self.getZMILangStr('BTN_INSERT'):
-        #-- Stylesheet.
-        if REQUEST.has_key('newCssId'):
-          title = 'CSSschema'
-          data = '<dtml-with content\n><dtml-call "REQUEST.RESPONSE.setHeader(\'Cache-Control\',\'public, max-age=3600\')"\n><dtml-var f_standard_html_request\n><dtml-var f_css_defaults>\n\n</dtml-with>'
-          self.common.css.manage_addDTMLMethod( REQUEST.get('newCssId'), title, data)
-          message = self.getZMILangStr('MSG_INSERTED')%REQUEST.get('newCssId')
-          cssId = REQUEST.get('newCssId')
-      
-      # Delete.
-      # -------
-      if btn == self.getZMILangStr('BTN_DELETE'):
-        #-- Stylesheet.
-        if REQUEST.has_key('cssId'):
-          self.common.css.manage_delObjects(ids=[REQUEST.get('cssId')])
-          message = self.getZMILangStr('MSG_DELETED')%int(1)
-          cssId = ''
-      
       # Ex-/Import.
       # -----------

ZMS/trunk/_globals.py

@@ -29 +29 @@
 import cgi
 import copy
+import fnmatch
 import logging
 import operator
@@ -472 +473 @@
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 def http_import(self, url, method='GET', auth=None, parse_qs=0, timeout=5):
-
+  
   HTTP_PREFIX = 'http://'
-
+  
   # Get Query-String.
   qs = ''
@@ -484 +485 @@
   # Get Host.
   host = ''
-  if not url.startswith(HTTP_PREFIX+'localhost') and \
-     not url.startswith(HTTP_PREFIX+'127.0.0.1'):
+  servername = url
+  if servername.startswith(HTTP_PREFIX):
+    servername = servername[len(HTTP_PREFIX):]
+  if servername.find('/') > 0:
+    servername = servername[:servername.find('/')]
+  useproxy = True
+  noproxy = ['localhost','127.0.0.1']+filter(lambda x: len(x)>0,map(lambda x: x.strip(),self.getConfProperty('HTTP.noproxy','').split(',')))
+  for noproxyurl in noproxy:
+    if fnmatch.fnmatch(servername,noproxyurl):
+      useproxy = False
+      break
+  if useproxy:
     host = self.getConfProperty('HTTP.proxy',host)
+  
   if len( host) == 0:
-  
     # Remove HTTP-Prefix.
     if url.startswith( HTTP_PREFIX):

ZMS/trunk/dtml/ZMS/headcstylesheet.dtml

@@ -10 +10 @@
 ><dtml-in "getStylesheets()"><link rel="<dtml-unless sequence-start>alternate </dtml-unless>stylesheet" type="text/css" href="<dtml-if "(REQUEST.get('ZMS_PATHCROPPING',False) or getConfProperty('ZMS.pathcropping',0)==1) and REQUEST.get('export_format','')==''"><dtml-var "absolute_url()[len(REQUEST.get('BASE0','')):]"><dtml-else><dtml-var "absolute_url()"></dtml-if>" />
 </dtml-in
-></dtml-if
-><dtml-if preview><style id="preview stylesheet" type="text/css"><!-- --></style></dtml-if>
+></dtml-if>

ZMS/trunk/dtml/ZMS/manage_customize.dtml

@@ -187 +187 @@
    {'key':'ASP.ip_or_domain','title':'ASP IP/Domain','desc':'ASP IP/Domain.','datatype':'string'},
    {'key':'HTTP.proxy','title':'HTTP proxy','desc':'HTTP proxy (host:port).','datatype':'string'},
+   {'key':'HTTP.noproxy','title':'HTTP noproxy','desc':'comma-delimited list of url-patterns that do not use HTTP proxy.','datatype':'string'},
    {'key':'jquery.version','title':'JQuery version','desc':'JQuery version.','datatype':'string'},
    {'key':'jquery.ui.version','title':'JQuery UI version','desc':'JQuery UI version.','datatype':'string'},

ZMS/trunk/dtml/ZMS/manage_customizedesignform.dtml

@@ -1 +1 @@
 <dtml-var manage_page_header>
-
-<script language="JavaScript">
-<!--//
-
-  /**
-   *
-   * @param fm          Html-Form
-   */
-  function onForm0Submit(fm) 
-  {
-    var b = true;
-    if (self.btnClicked=="<dtml-var "getZMILangStr('BTN_DELETE')" html_quote>") 
-    {
-      b = b && confirm("<dtml-var "getZMILangStr('MSG_CONFIRM_DELOBJ')">");
-    }
-    return b;
-  }
-
-//-->
-</script>
 </head>
-
 <dtml-var manage_tabs>
 <dtml-var "manage_tabs_sub(_,_,manage_sub_options=customize_manage_options)">
 
-  <form name="form0" action="manage_customizeDesign" method="post" onsubmit="return onForm0Submit(this)" enctype="multipart/form-data">
+  <form name="form0" action="manage_customizeDesign" method="post" enctype="multipart/form-data">
   <input type="hidden" name="lang" value="<dtml-var lang>">
 
@@ -84 +63 @@
       &nbsp;&nbsp;<input class="form-checkbox" type="checkbox" name="default:int" value="1" <dtml-if "getStylesheet().id()==cssId">checked="checked"</dtml-if>/>&nbsp;Default&nbsp;&nbsp;&nbsp;&nbsp;
      </td>
-     <td align="right" class="form-small" valign="bottom">
-      <dtml-var "getZMILangStr('ACTION_INSERT')%display_type(REQUEST)">:
-      <input class="form-small" name="newCssId" value="styles-<dtml-var "len(ids)+1">.css" size="20"/>
-      <input class="form-small" name="btn" type="submit" value="<dtml-var "getZMILangStr('BTN_INSERT')" html_quote>" onclick="self.btnClicked=this.value;" />
-     </td>
     </tr>
     </table>
@@ -98 +72 @@
        rows="25"
      ><dtml-with "getStylesheet(cssId)"><dtml-var raw html_quote></dtml-with></textarea>
-     <a href="manage_editorForm?displayPreview=True&came_from=<dtml-var URL>&lang=<dtml-var lang>&fmName=form0&elName=stylesheet:text&headline=<dtml-var "getZMILangStr('ATTR_STYLESHEET')+': '+cssId" url_quote>" onclick="javascript:return confirmChanges(this);" class="button"><img src="<dtml-var MISC_ZMS>ico_plus.gif" alt="<dtml-var "getZMILangStr('BTN_EDIT')">" title="<dtml-var "getZMILangStr('BTN_EDIT')">" border="0"/></a>
     </dtml-let>
    </td>
@@ -107 +80 @@
     <div class="form-element">
      <input class="ui-button ui-state-default ui-corner-all" name="btn" type="submit" value="<dtml-var "getZMILangStr('BTN_SAVE')" html_quote>" onclick="self.btnClicked=this.value;" />
-     <dtml-unless "getStylesheet().id()==cssId">
-      <input class="ui-button ui-state-default ui-corner-all" name="btn" type="submit" value="<dtml-var "getZMILangStr('BTN_DELETE')" html_quote>" onclick="self.btnClicked=this.value;" />
-     </dtml-unless>
     </div>
    </td>

ZMS/trunk/dtml/ZMS/manage_editorform.dtml

@@ -42 +42 @@
          var div = $('div#system_msg',parent.cameFromForm.document);
          if (div.length > 0 && div.html() != '') {
-           <dtml-if displayPreview>
-           // Update div with system-msg.
-           $('#system_msg').html(div.html()).show('normal');
-           onResize();
-           // Reload preview-form.
-           if ( parent.previewForm) {
-             parent.previewForm.location.reload();
-           }
-           </dtml-if>
            b = true;
            // Set counter to maximum to finish initialization.
@@ -188 +179 @@
 <dtml-else>
  <frameset name="editorFrameset" cols="30%,70%">
-  <frame name="editorFrame" scrolling="auto" src="<dtml-var "url_append_params(URL,{'lang':lang,'came_from':came_from,'displayPreview':str(REQUEST.get('displayPreview','')),'fmName':fmName,'elName':elName,'headline':headline,'manage_editorFrame':'True'})">">
+  <frame name="editorFrame" scrolling="auto" src="<dtml-var "url_append_params(URL,{'lang':lang,'came_from':came_from,'fmName':fmName,'elName':elName,'headline':headline,'manage_editorFrame':'True'})">">
   <dtml-if displayPreview>
    <frameset rows="0,*">

ZMS/trunk/dtml/ZMSContainerObject/sitemap/version0.dtml

@@ -1 +1 @@
 <dtml-let breadcrumbs="breadcrumbs_obj_path()"
 
+ ><dtml-call "REQUEST.set('catalog_items',[])"
+ ><dtml-call "REQUEST.set('pos',0)"
  ><dtml-call "REQUEST.set('docElmnt',None)"
  ><dtml-in breadcrumbs

ZMS/trunk/dtml/versionmanager/manage_tasks.dtml

@@ -21 +21 @@
    <th class="form-label"><dtml-var "getZMILangStr('ATTR_DISPLAY')"></th>
    <td class="form-element">
-    <select class="form-element" name="task_type">
+    <select class="form-element" id="task_type" name="task_type">
      <option value="">--- <dtml-var "getZMILangStr('ACTION_SELECT')%getZMILangStr('ATTR_DISPLAY')"> ---</option>
      <dtml-in "getWfActivities()" mapping>

ZMS/trunk/zmsobject.py

@@ -578 +578 @@
 
     security.declareProtected('ZMS Author','getTempFormProperties')
-    def getTempFormProperties(self, lang, key, REQUEST, RESPONSE=None):
+    def getTempFormProperties(self, lang=None, key=None, REQUEST=None, RESPONSE=None):
       """ ZMSObject.getTempFormProperties """
+      if lang is None or key is None or REQUEST is None: return
       rtn = 0
       container = self.getTempFormPropertiesContainer()