Changeset 18

Timestamp:

11/09/06 12:35:18 (5 years ago)

Author:

christian

Message:

Working wiki-sitemap, admin page is not functional yet

Location:

sitemap-plugin/trunk

Files:

• COPYING (added)
• setup.cfg (added)
• setup.py (modified) (2 diffs)
• sitemap/__init__.py (modified) (1 diff)
• sitemap/admin_ui.py (modified) (1 diff)
• sitemap/api.py (added)
• sitemap/google.py (deleted)
• sitemap/templates/sitemap_admin.cs (modified) (3 diffs)
• sitemap/wiki.py (added)

sitemap-plugin/trunk/setup.py

@@ -1 +1 @@
 #!/usr/bin/env python
 
-from setuptools import setup, find_packages
+from setuptools import setup
 
 PACKAGE = 'sitemap'
@@ -10 +10 @@
         author_email = 'christian@wilde-welt.de',
         url = 'http://voidblog.de/wiki/GoogleSitemap',
-        description = 'Google sitemap generator',
+        description = 'Various sitemap generators',
         license='BSD',
-        package_dir = { 'sitemap' : 'sitemap' },
         packages = ['sitemap'],
         package_data = { 'sitemap' : [ 'templates/*.cs', ]},

sitemap-plugin/trunk/sitemap/__init__.py

@@ +1 @@
+import api
+import wiki
 try:
-    from admin import *
+    from admin_ui import *
 except ImportError:
     pass
-import google
-import admin_ui

sitemap-plugin/trunk/sitemap/admin_ui.py

@@ -1 @@
-from pkg_resources import resource_filename
+from pkg_resources import resource_filename #@UnresolvedImport
 from webadmin.web_ui import IAdminPageProvider
 from trac.web.chrome import ITemplateProvider
-from trac.perm import IPermissionRequestor
 from trac.core import implements
 from trac.core import Component
 
+from api import SitemapController
 
-class SitemapAdmin(Component):
+class SitemapAdminPage(Component):
     """
         Generates a sitemap file suitable for Google Sitemaps
     """
     
-    implements(ITemplateProvider, IAdminPageProvider, IPermissionRequestor)
+    implements(ITemplateProvider, IAdminPageProvider)
+    
+    priorities = [ 1.0, 0.9, 0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2, 0.1 ]
+    frequencies = [ 'never', 'yearly', 'monthly', 'weekly', 'daily', 'hourly', 'always']
 
-    # IPermissionRequestor
-    def get_permission_actions(self):
-        return ['BLOG_ADMIN']
-
+    def _get_field(self, req, name, default_value):
+        if name in req.args:
+            return req.args[name]
+        return default_value
+    
     # IAdminPageProvider methods
     def get_admin_pages(self, req):
-        if req.perm.has_permission('BLOG_ADMIN'):
-            yield ('general', 'General', 'sitemap', 'Sitemap')
+        if req.perm.has_permission('TRAC_ADMIN'):
+            yield ('general', 'General', 'sitemap_admin', 'Sitemap')
 
     def process_admin_request(self, req, cat, page, path_info):
-        assert req.perm.has_permission('BLOG_ADMIN')
+        assert req.perm.has_permission('TRAC_ADMIN')
+        c = SitemapController(self.env)
 
-        # add_stylesheet(req, 'blog/css/blog.css')
-        # add_stylesheet(req, 'common/css/wiki.css')
-        req.hdf['sitemap.url'] = req.base_url + '/sitemap.xml'
-        req.hdf['sitemap.priorities'] = [ 1.0, 0.9, 0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2, 0.1 ]
-        req.hdf['sitemap.frequencies'] = [ 'monthly', 'weekly', 'daily']
+        if req.method == 'POST':
+            if page == 'sitemap':
+                if 'save' in req.args:
+                    for contributor in c.contributors:
+                        name, title = contributor.get_name() #@UnusedVariable
+                        contributor.set_configuration(
+                                                      self._get_field(req, name + '_priority', contributor.priority),
+                                                      self._get_field(req, name + '_frequency', contributor.frequency)
+                                                      )
+
+        req.hdf['sitemap.data'] = c.get_descriptions()
+        req.hdf['sitemap.url'] = c.path
+        req.hdf['sitemap.priorities'] = self.priorities
+        req.hdf['sitemap.frequencies'] = self.frequencies
         return 'sitemap_admin.cs', None
 

sitemap-plugin/trunk/sitemap/templates/sitemap_admin.cs

@@ -1 +1 @@
 <form class="mod" method="post">
 <h2>Google Sitemap&trade; settings</h2>
-<p>The URL of the Google sitemap is: <?cs var:sitemap.url ?></p>
+<p>What ressources should be included in your sitemap located at <strong><?cs var:sitemap.url ?></strong>?</p>
 <table class="listing" id="sitemaplist" style="width:100%;margin-bottom:2em;">
         <colgroup>
@@ -11 +11 @@
         <thead>
                 <tr>
-                        <th class="sel">&nbsp;</th>
+                        <th class="sel">Auto-update</th>
                         <th>Source</th>
                         <th>Priority</th>
@@ -18 +18 @@
         </thead>
         <tbody>
+                <?cs each:item = sitemap.data ?>
                 <tr>
-                        <td><input type="checkbox" name="wiki" value="1"/></td>
-                        <td><strong>Wiki pages</strong></td>
-                        <td><select>
+                        <td align="center"><input type="checkbox" name="handle_<?cs name:item ?>" value="1" <?cs
+                        if:item.handle ?> checked="checked" <?cs /if ?> /></td>
+                        <td><strong><?cs var:item.title ?></strong></td>
+                        <td><select name="<?cs name:item ?>_priority">
                 <?cs each:priority = sitemap.priorities ?>
-                <option value="<?cs var:priority ?>"><?cs var:priority ?></option>
+                <option value="<?cs var:priority ?>" <?cs if:priority == item.priority ?>selected="selected"<?cs /if ?>><?cs var:priority ?></option>
                 <?cs /each ?>
            </select></td>
-           <td><select>
+           <td><select name="<?cs name:item ?>_frequency">
                 <?cs each:freq = sitemap.frequencies ?>
-                <option value="<?cs var:freq ?>"><?cs var:freq ?></option>
+                <option value="<?cs var:freq ?>" <?cs if:freq == item.frequency ?>selected="selected"<?cs /if ?>><?cs var:freq ?></option>
                 <?cs /each ?>
            </select></td>
                 </tr>
-                <tr>
-                        <td><input type="checkbox" name="tickets" value="1"/></td>
-                        <td><strong>Tickets</strong></td>
-                        <td><select>
-                <?cs each:priority = sitemap.priorities ?>
-                <option value="<?cs var:priority ?>"><?cs var:priority ?></option>
-                <?cs /each ?>
-           </select></td>
-           <td><select>
-                <?cs each:freq = sitemap.frequencies ?>
-                <option value="<?cs var:freq ?>"><?cs var:freq ?></option>
-                <?cs /each ?>
-           </select></td>
-                </tr>
+                <?cs /each ?>
         </tbody>
         <tfoot>
                 <tr>
-                        <td colspan="4" style="font-size:80%;">A note on priorities and frequencies: The <strong>priority</strong> will determine
-                        how search results will be ranked <em>within your site</em>. It will not influence
-                        your Google PageRank&trade;. The priority defaults to 0.5, you can set higher or
-                        lower values to distinguish more or less important parts of your site.
+                        <td colspan="4" style="font-size:80%;">Note: The <strong>priority</strong> will determine
+                        how search results will be ranked <em>within your site</em>, bigger numbers indicating more important parts of your site.
+                        It will not influence your Google PageRank&trade;.
                         <p>The <strong>frequency</strong> indicates how often you plan to update
                         your site content with respect to this ressource. Setting it to <em>daily</em> doesn't neccessarily mean that Google will pick
-                        up your page daily, it's just an indicator.</p></td>
+                        up your page daily, it's just an indicator. Even pages marked as <em>never changing</em> (i.e. archives) are visited by the Google crawler
+                        every once in a while to detect changes in the page itself.</p></td>
                 </tr>
         </tfoot>
 </table>
-<fieldset>
-        <legend>Notification</legend>
-   <div class="field">
-        <input id="cbPingGoogle" type="checkbox" name="pinggoogle" value="1" style="float:left"/>
-      <label for="cbPingGoogle" style="display:block; margin-left: 50px;">
-       Do you want to ping the Google Sitemap service each time a wiki
-       page is created, updated or deleted?
-      </label>
-    </div>
-</fieldset>
 <div class="buttons">
-        <input type="submit" value="Save">
-        <input type="submit" value="Save &amp; ping now">
+        <input type="submit" name="save" value="Save">
+        <input type="submit" name="saveping" value="Save &amp; notify now">
 </div>
 </form>