Changeset 12457 for trunk

Timestamp:

02/09/11 09:06:55 (13 years ago)

Author:

sil

Message:

• Made some corrections in settings.py, and added comments to clarify things.
• Acted like an indenting- and language-purist

Location:

trunk/sara_cmt/sara_cmt

Files:

• cluster/models.py (modified) (1 diff)
• cluster/templatetags/ramonb_extras.py (modified) (5 diffs)
• settings.py (modified) (2 diffs)

trunk/sara_cmt/sara_cmt/cluster/models.py

@@ -131 +131 @@
     host      = models.ForeignKey('HardwareUnit', related_name='interfaces',
                                   verbose_name='machine')
-    iftype      = models.ForeignKey('InterfaceType', related_name='interfaces',
+    iftype    = models.ForeignKey('InterfaceType', related_name='interfaces',
                                   verbose_name='type')
     label     = models.CharField(max_length=255, help_text='Automagically \

trunk/sara_cmt/sara_cmt/cluster/templatetags/ramonb_extras.py

@@ -65 +65 @@
         Variable assignment within template
 
-        Usage: {% assign newvar = <space seprated list of strings/vars %}
+        Usage: {% assign newvar = <space seprated list of strings/vars> %}
          i.e.: {% assign file_name = '/var/tmp/rack-' rack.label '.txt' %}
     """
@@ -97 +97 @@
             if not (a[0] == a[-1] and a[0] in ('"', "'")):
                 try:
-                    # RB: no quotes must mean its an variable
+                    # RB: no quotes must mean its a variable
                     #
                     a_var = template.Variable( a )
@@ -159 +159 @@
 
         else:
-            # RB: Not quoted: must be an variable: attempt to resolve to value
+            # RB: Not quoted: must be a variable: attempt to resolve to value
             try:
                 pathvar = template.Variable( str(self.path_str) )
                 mypath_str = pathvar.resolve(context)
             except template.VariableDoesNotExist:
-                #raise template.TemplateSyntaxError, '%r tag argument 1: not an variable %r' %( tag, path_str )
+                #raise template.TemplateSyntaxError, '%r tag argument 1: not a variable %r' %( tag, path_str )
                 pass
 
@@ -236 +236 @@
             network_str = str( self.network_name.strip("'").strip('"') )
         else:
-            # RB: Not quoted: must be an variable: attempt to resolve to value
+            # RB: Not quoted: must be a variable: attempt to resolve to value
             try:
                 networkvar = template.Variable( str(self.network_name) )
                 network_str = networkvar.resolve(context)
             except template.VariableDoesNotExist:
-                #raise template.TemplateSyntaxError, '%r tag argument 1: not an variable %r' %( tag, path_str )
+                #raise template.TemplateSyntaxError, '%r tag argument 1: not a variable %r' %( tag, path_str )
                 pass
 
@@ -337 +337 @@
             myquery_str = str( self.query.strip("'").strip('"') )
         else:
-            # RB: Not quoted: must be an variable: attempt to resolve to value
+            # RB: Not quoted: must be a variable: attempt to resolve to value
             try:
                 queryvar = template.Variable( str(self.query) )
                 myquery_str = queryvar.resolve(context)
             except template.VariableDoesNotExist:
-                #raise template.TemplateSyntaxError, '%r tag argument 1: not an variable %r' %( tag, path_str )
+                #raise template.TemplateSyntaxError, '%r tag argument 1: not a variable %r' %( tag, path_str )
                 pass
 

trunk/sara_cmt/sara_cmt/settings.py

@@ -140 +140 @@
 ROOT_URLCONF = 'sara_cmt.urls'
 
+# Templates for the CMT web-frontend.
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates"
@@ -146 +147 @@
     # Don't forget to use absolute paths, not relative paths.
     os.path.normpath(os.path.join(os.path.dirname(__file__), 'cluster/templates')),
-    #os.path.normpath(os.path.join(os.path.dirname(__file__), '../templates')),
-    '/etc/sara_cmt/templates'
 )
 
+# Templates for the CMT command line interface.
+# (thus, the templates for our configfiles, etc)
 CMT_TEMPLATES_DIR = '/etc/sara_cmt/templates'
-#CMT_TEMPLATES_DIR = os.path.normpath(os.path.join(os.path.dirname(__file__), \
-#    '../templates'))
-#CMT_TEMPLATE_DIRS = (os.path.normpath(os.path.join(os.path.dirname(__file__),
-#'../templates')),)
 
 FIXTURE_DIRS = (
     # A fixture is a collection of files that contain serialized contents of
-    # the database.
+    # the database. (can be used for testing)
     os.path.normpath(os.path.join(os.path.dirname(__file__), 'fixtures')),
 )