Skip to content

Fixed some page issues #1

Closed
wants to merge 3 commits into from
View
10 Commits.py
@@ -66,11 +66,11 @@ def get_commit_list (num):
#
# Widget
#
-class Latest_SVN_Commits_Widget (CTK.Box):
+class Latest_GIT_Commits_Widget (CTK.Box):
def __init__ (self, num=7):
CTK.Box.__init__ (self, {'id': 'latest-commits'})
- self += CTK.Box({'class': 'bar3-title'}, CTK.RawHTML('<a href="http://svn.cherokee-project.com/log.php?repname=Cherokee&path=%2F&rev=6636&isdir=1" target="_blank">Latest Commits</a>'))
+ self += CTK.Box({'class': 'bar3-title'}, CTK.RawHTML('<a href="https://github.com/cherokee/webserver/commits/dev" target="_blank">Latest Commits</a>'))
for commit in get_commit_list (num):
user = commit[0]
@@ -93,7 +93,7 @@ def __init__ (self, num=7):
self += content_box
- self += CTK.Box({'class': 'bar3-bottom-link'}, CTK.RawHTML('<a href="https://github.com/cherokee/webserver/commits/master/" target="_blank">View Commits Log &raquo;</a>'))
+ self += CTK.Box({'class': 'bar3-bottom-link'}, CTK.RawHTML('<a href="https://github.com/cherokee/webserver/commits/dev" target="_blank">View Commits Log &raquo;</a>'))
#
@@ -102,12 +102,12 @@ def __init__ (self, num=7):
latest_widget = None
latest_widget_expiration = None
-def Latest_SVN_Commits():
+def Latest_GIT_Commits():
global latest_widget
global latest_widget_expiration
if not latest_widget or time.time() > latest_widget_expiration:
- latest_widget = Latest_SVN_Commits_Widget()
+ latest_widget = Latest_GIT_Commits_Widget()
latest_widget_expiration = time.time() + CACHE_EXPIRATION
return latest_widget
View
6 PageDownload.py
@@ -104,6 +104,12 @@ class Download_MacOSX:
def __call__ (self):
# Find the DMG file
dmg_refs = Downloads.get_latest_macosx_dmg()
+ # no macos package found
+ if not dmg_refs:
+ content = CTK.Container()
+ content += CTK.RawHTML ("<h3>%s</h3>" %(_("We can't find now packaged version...")))
+ content += CTK.RawHTML ("<p>%s</p>" %(_("We recommend to use git and compile cherokee.")))
+ return CTK.HTTP_Cacheable (60, body = content.Render().toStr())
dmg_local, dmg_web = dmg_refs
dmg_url = "http://www.cherokee-project.com%s"%(dmg_web)
View
4 PageIndex.py
@@ -105,7 +105,7 @@ class Sidebox (CTK.Container):
'title': 'Read the Documentation',
'hint': 'Tutorials, recipes, etc'
},
- 'contruibute': {
+ 'contribute': {
'icon': '/static/images/contribute.png',
'url': '/contribute.html',
'title': 'Contribute to the project',
@@ -155,7 +155,7 @@ def __call__ (self):
page += bar3
bar3 = CTK.Box ({'class': 'bar3'})
- bar3 += Commits.Latest_SVN_Commits()
+ bar3 += Commits.Latest_GIT_Commits()
page += bar3
bar3 = CTK.Box ({'class': 'bar3'})
Something went wrong with that request. Please try again.