Changeset 29

Timestamp:

12/30/06 02:30:39 (5 years ago)

Author:

tim

Message:

Allow for planet configuration from within the admin controller

Location:

trunk

Files:

• cogplanet/admin/controller.py (modified) (8 diffs)
• cogplanet/controllers.py (modified) (1 diff)
• cogplanet/model.py (modified) (1 diff)
• cogplanet/static/css/style.css (modified) (1 diff)
• cogplanet/templates/admin/layout.html (modified) (3 diffs)
• cogplanet/templates/admin/planet.html (added)
• cogplanet/templates/index.html (modified) (1 diff)
• dev.cfg (modified) (1 diff)

trunk/cogplanet/admin/controller.py

@@ -2 +2 @@
 
 from turbogears import database
-from turbogears import controllers, expose, url
+from turbogears import controllers, expose, url, error_handler
 from turbogears import identity, redirect
 from turbogears import validate
+from turbogears import validators
 from turbogears.widgets import *
 
@@ -10 +11 @@
 from cogplanet.model import *
 from cogplanet.util import *
+
+class PlanetFields(WidgetsList):
+    id = HiddenField(name="id")
+    name = TextField(name="name", attrs={'size':60})
+    display_entries = TextField(name="display_entries",
+                                label="Entries to display",
+                                validator=validators.Number(),
+                                attrs={'size': 60})
+    update_interval = TextField(name="update_interval", 
+                                label="Update Interval (Minutes)",
+                                validator=validators.Number(),
+                                attrs={'size': 60})
+
+class PlanetForm(TableForm):
+    fields = PlanetFields()
+    submit_text = "Save Changes"
 
 class FeedFields(WidgetsList):
@@ -17 +34 @@
     xmlurl = TextField(name="xmlurl", label="XML URL", attrs={'size': 60})
     updated_at = CalendarDateTimePicker(name="updated_at", label="Updated At")
-    update_interval = TextField(name="update_interval", label="Update Interval (Minutes)", attrs={'size': 60})
+    update_interval = TextField(name="update_interval", 
+                                label="Update Interval (Minutes)",
+                                validator=validators.Number(),
+                                attrs={'size': 60})
     
 class FeedForm(TableForm):
@@ -33 +53 @@
     feed_form = FeedForm()
     import_form = ImportForm()
+    planet_form = PlanetForm()
 
     @expose()
@@ -47 +68 @@
         entry = Entry.selectone(Entry.c.id==id)
         print entry.content
-        return({'entry':entry})
+        planet = Planet.selectone()
+        return({'entry':entry,
+                'planet':planet})
 
     @expose(template="cogplanet.templates.admin.import_feeds")
@@ -55 +78 @@
         if opml_file != None:
             import_opml(opml_file.file)
+        planet = Planet.selectone()
         # TODO should return the number of feeds imported
-        return({'import_form': self.import_form})
+        return({'import_form': self.import_form,
+                'planet':planet})
+
+    @expose(template="cogplanet.templates.admin.planet")
+    @identity.require(identity.in_group("cp_admin"))
+    def planet_view(self):
+        planet = Planet.selectone()
+        return({'planet': planet,
+                'planet_form': self.planet_form})
+
+    @expose()
+    @validate(planet_form)
+    @error_handler(planet_view)
+    @identity.require(identity.in_group("cp_admin"))
+    def planet_update(self, **kw):
+        planet = Planet.selectone()
+        planet.name = kw['name']
+        planet.display_entries = kw['display_entries']
+        planet.update_interval = kw['update_interval']
+        raise cherrypy.HTTPRedirect('./planet_view')
 
     @expose()
@@ -97 +140 @@
         if(id != 'new'):
             feed = Feed.selectone("id=%d" % int(id))
+        planet = Planet.selectone()
         return({'feed': feed,
-                'feed_form': self.feed_form})
+                'feed_form': self.feed_form,
+                'planet': planet})
 
     @expose(template="cogplanet.templates.admin.index")
@@ -104 +149 @@
     def index(self):
         feeds = Feed.select(order_by="name")
-        return({"feeds": feeds})
+        planet = Planet.selectone()
+        return({"feeds": feeds,
+                'planet': planet})

trunk/cogplanet/controllers.py

@@ -37 +37 @@
     # @identity.require(identity.in_group("admin"))
     def index(self):
-        entries = Entry.select(Entry.c.parsed == True, order_by="updated_at DESC", limit=10)
+        planet = Planet.selectone()
+        entries = Entry.select(Entry.c.parsed == True, 
+                               order_by="updated_at DESC", 
+                               limit=planet.display_entries)
         feeds = Feed.select(order_by="name ASC")
-        planet = Planet.selectone()
         return {"entries":entries,
                 "feeds":feeds,

trunk/cogplanet/model.py

@@ -19 +19 @@
         id = column(Integer, primary_key=True)
         name = column(Unicode, nullable=False)
+        display_entries = column(Integer, default=50, nullable=False)
         update_interval = column(Integer, default=1440, nullable=False)
         # TODO cascade='delete' (currently unsupported)

trunk/cogplanet/static/css/style.css

@@ -67 +67 @@
 }
 
+#header h1, #header h2 { 
+  margin: 0;
+  padding: 0;
+}
+
 #menu { 
   background-color: #000;

trunk/cogplanet/templates/admin/layout.html

@@ -2 +2 @@
 
   <head>
-    <title>${page_title()}</title>
+    <title>${planet.name} ${page_title()}</title>
     <link href="/static/css/style.css" type="text/css" rel="stylesheet" />
   </head>
@@ -8 +8 @@
   <body>
     <div id="header">
-      <h1>CogPlanet :: ${page_title()}</h1>
+      <h1>${planet.name}</h1>
+      <h2>${page_title()}</h2>
     </div>
     <ul id="menu">
       <li><a href="" py:attrs="{'href': tg.url('/admin')}">Admin Home</a></li>
+      <li><a href="" py:attrs="{'href': tg.url('/admin/planet_view')}">Configuration</a></li>
       <li><a href="" py:attrs="{'href': tg.url('/admin/new/view')}">Add a Feed</a></li>
       <li><a href="" py:attrs="{'href': tg.url('/admin/import_feeds')}">Import OPML</a></li>
@@ -18 +20 @@
     <div id="main_content"><content>Default content</content></div>
 
-    <div id="footer">Page Footer Text</div>
+    <div id="footer">
+      <span style="float:left;">Powered by <a href="http://achievewith.us/projects/cogplanet">CogPlanet</a></span>
+      <span style="float:right;">Built on <a href="http://turbogears.org">TurboGears</a></span>
+    </div>
   </body>
 

trunk/cogplanet/templates/index.html

@@ -6 +6 @@
 
 <div py:match="content">
+ <div py:if="len(feeds) == 0">
+   <h1>Welcome</h1>
+
+   <p>This looks like a new planet, so you are probably the new planet
+   administrator.  You should log in to
+   the <a href="./admin">administration section</a> and add the feeds
+   that you want to aggregate.</p>
+
+   <p>If you have any trouble using CogPlanet, or you feel a desire to
+   improve this software, visit
+   the <a href="http://achievewith.us/projects/cogplanet">CogPlanet
+   Trac</a>.</p>
+
+ </div>
+
 
  <div py:for="entry in entries">

trunk/dev.cfg

@@ -5 +5 @@
 # cogplanet/config/app.cfg
 
-easy_config.enabled = False
+easy_config.enabled = True
+tg.scheduler = True
 
 # DATABASE