[cmsiki-svn] SF.net SVN: cmsiki: [23] trunk/cmsiki

[<cn...@us...>]

Revision: 23
          http://cmsiki.svn.sourceforge.net/cmsiki/?rev=23&view=rev
Author:   cnu
Date:     2007-04-02 11:07:33 -0700 (Mon, 02 Apr 2007)

Log Message:
-----------
cmsikireplace returns html <br/> instead of \n.
removed published boolean field from story
added automatic permanent pages creation in template's top nav bar.

Modified Paths:
--------------
    trunk/cmsiki/apps/story/models.py
    trunk/cmsiki/cmsikireplace.py
    trunk/cmsiki/templates/base.html

Modified: trunk/cmsiki/apps/story/models.py
===================================================================
--- trunk/cmsiki/apps/story/models.py	2007-04-02 17:29:06 UTC (rev 22)
+++ trunk/cmsiki/apps/story/models.py	2007-04-02 18:07:33 UTC (rev 23)
@@ -23,7 +23,6 @@
     author = models.ForeignKey(User)
     pub_date = models.DateTimeField('Publish Date')
     datetime = models.DateTimeField(auto_now_add=True,editable=False)
-    published = models.BooleanField()
     
     def __str__(self):
         return self.title
@@ -32,8 +31,8 @@
         ordering = ['-pub_date']
         
     class Admin:
-        list_display = ('title','category','author','pub_date','published')
-        list_filter = ('pub_date','author','published')
+        list_display = ('title','category','author','pub_date')
+        list_filter = ('pub_date','author')
         search_fields = ('title','body')
         js = ('js/tiny_mce/tiny_mce.js', 'js/textareas.js')
     

Modified: trunk/cmsiki/cmsikireplace.py
===================================================================
--- trunk/cmsiki/cmsikireplace.py	2007-04-02 17:29:06 UTC (rev 22)
+++ trunk/cmsiki/cmsikireplace.py	2007-04-02 18:07:33 UTC (rev 23)
@@ -24,6 +24,7 @@
      'url':'http://nrcfosshelpline.in/chennaipy/',
      'xmlrpc':'http://nrcfosshelpline.in/chennaipy/?action=xmlrpc2'}
     ]
+
 class WikiNameError(Exception):
     def __init__(self, value):
         self.value = value
@@ -74,8 +75,8 @@
     try:
         page_content = srcwiki.getPage(page_name)
     except httplib.socket.error:
-        page_content = ''        
-    return page_content
+        page_content = ''
+    return page_content.replace('\n','<br/>')
 
 def getPageInfo(tag):
     '''Return the page contents from the wiki as WikiText.'''
@@ -95,7 +96,7 @@
     except httplib.socket.error:
         page_info = ''
     # return the wiki page info in a string format
-    page_string_info = 'PageName: %s \nAuthor: %s \nVersion: %s \n' \
+    page_string_info = 'PageName: %s <br/>\nAuthor: %s <br/>\nVersion: %s \n' \
                        %(page_info['name'], page_info['author'], page_info['version'])
     return str(page_string_info)
 

Modified: trunk/cmsiki/templates/base.html
===================================================================
--- trunk/cmsiki/templates/base.html	2007-04-02 17:29:06 UTC (rev 22)
+++ trunk/cmsiki/templates/base.html	2007-04-02 18:07:33 UTC (rev 23)
@@ -22,8 +22,12 @@
 	  <ul>
 	    <li><a href="http://localhost:8000/"
 		   title="home">Home</a></li> 
-	    <li><a href="http://localhost:8000/about"
-		   title="About">About</a></li>  
+	    {% for page in pages %}
+	    <li class="page_item">
+	      <a href="{{ page.get_absolute_url }}"
+		 title="{{ page.title }}">{{ page.title }}</a>
+	    </li>
+	    {% endfor %}
 	  </ul>
 	</div>
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.