[Blends-commit] r1796 - in blends/trunk/webtools: . templates

[Debian Pure Blends Subversion Commit]

Author: tille
Date: Tue Aug 18 19:44:27 2009
New Revision: 1796
URL: http://svn.debian.org/viewsvn/blends?rev=1796&view=rev

Log:
Very simple implementation or "Registration" feature.  Enhancement of text and layout has to be done.


Modified:
   blends/trunk/webtools/blendstasktools.py
   blends/trunk/webtools/templates/tasks.xhtml

Modified: blends/trunk/webtools/blendstasktools.py
URL: http://svn.debian.org/viewsvn/blends/blends/trunk/webtools/blendstasktools.py?rev=1796&view=diff&r1=1796&r2=1795&p1=blends/trunk/webtools/blendstasktools.py&p2=blends/trunk/webtools/blendstasktools.py
==============================================================================
--- blends/trunk/webtools/blendstasktools.py	(original)
+++ blends/trunk/webtools/blendstasktools.py	Tue Aug 18 19:44:27 2009
@@ -1198,16 +1198,28 @@
                         dep.pkgstatus = 'pkgvcs'
                 elif key == 'section':
                     if dep != None:
-                        dep.section  = stanza['section']
+                        dep.properties[key.lower()]  = stanza[key.lower()]
                     else:
-                        print >>stderr, "Dep not initiated before Section %s -> something is wrong." \
-                              % stanza['license']
+                        print >>stderr, "Dep not initiated before %s %s -> something is wrong." \
+                              % (key, stanza[key.lower()])
                 elif key == 'License':
                     if dep != None:
-                        dep.properties['license']  = stanza['license']
+                        dep.properties[key.lower()]  = stanza[key.lower()]
                     else:
-                        print >>stderr, "Dep not initiated before License %s -> something is wrong." \
-                              % stanza['license']
+                        print >>stderr, "Dep not initiated before %s %s -> something is wrong." \
+                              % (key, stanza[key.lower()])
+                elif key == 'Language':
+                    if dep != None:
+                        dep.properties[key.lower()]  = stanza[key.lower()]
+                    else:
+                        print >>stderr, "Dep not initiated before %s %s -> something is wrong." \
+                              % (key, stanza[key.lower()])
+                elif key == 'Registration':
+                    if dep != None:
+                        dep.properties[key.lower()]  = stanza[key.lower()]
+                    else:
+                        print >>stderr, "Dep not initiated before %s %s -> something is wrong." \
+                              % (key, stanza[key.lower()])
                 elif key == 'WNPP':
                     if dep != None:
                         # it makes sense to assume that a package where WNPP was recently closed
@@ -1328,7 +1340,7 @@
                                 dep.pkg            = virt_provides
                                 dep._QueryUDD4Package(source)
                     else:
-                        print >>stderr, "Warning: Dependency with unknown status:", dep.pkg
+                        print >>stderr, "Warning: Dependency with unknown status: %s (Task %s)" % (dep.pkg, dep.taskname)
 
             tmp_dep_list.append(dep)
             # remarks which are common to several dependencies in a list have to be added to all of the dependencies

Modified: blends/trunk/webtools/templates/tasks.xhtml
URL: http://svn.debian.org/viewsvn/blends/blends/trunk/webtools/templates/tasks.xhtml?rev=1796&view=diff&r1=1796&r2=1795&p1=blends/trunk/webtools/templates/tasks.xhtml&p2=blends/trunk/webtools/templates/tasks.xhtml
==============================================================================
--- blends/trunk/webtools/templates/tasks.xhtml	(original)
+++ blends/trunk/webtools/templates/tasks.xhtml	Tue Aug 18 19:44:27 2009
@@ -174,6 +174,14 @@
              </div>
            </td>
          </tr>
+	 <tr py:if="project.properties.has_key('registration')">
+	   <td colspan="3" class="registration">
+	     <strong><a href="${project.properties['registration']}">Please
+	     register</a></strong> The authors of project
+	     ${project.pkg} kindly ask you for registration if you are
+	     using this program.
+	   </td>
+	 </tr>
 	 <tr py:if="project.remark">
 	   <td colspan="3" class="remark">
 	     <div py:if="project.remark['short']"><strong>Remark of ${projectname} team:</strong> ${project.remark['short']}</div>