Author: duncan
Date: Fri Jun 1 17:54:34 2007
New Revision: 9624
Modified:
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/local_conf.py.example
branches/rel-1/freevo/src/www/web_types.py
Log:
[ 1729595 ] Allow links to personal web pages or site in webserver
Change done to enable this feature
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Fri Jun 1 17:54:34 2007
@@ -16,7 +16,9 @@
== Release 1.7.3 (2007-??-??) ==
--------------------------------
+ * Added personal web pages to the webserver, using PERSONAL_WWW_PAGE
(F#1729595)
* Fixed tv recordings manager not deleting files when out of space (B#1728182)
+ * Fixed problem with FXD.setattr not working correctly in all cases
(B#1728421)
== Release 1.7.2 (2007-05-26) ==
--------------------------------
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Fri Jun 1 17:54:34 2007
@@ -108,7 +108,7 @@
# of the config file doesn't match, Freevo won't start. If the minor version
# is different, there will be only a warning
-LOCAL_CONF_VERSION = 5.19
+LOCAL_CONF_VERSION = 5.20
# Description of changes in each new version
FREEVO_CONF_CHANGES = [
@@ -274,6 +274,9 @@
Added IMAGE_EXCLUDE as a regular expression to exclude images such as
thumbnails
Added TV_RECORD_FAVORITE_MARGIN to allow favourites to be added to the
schedule within a tolerance value
''' ),
+ (5.20,
+ '''Added PERSONAL_WWW_PAGE config item to allow private web pages in the
webserver
+ ''' ),
]
Modified: branches/rel-1/freevo/local_conf.py.example
==============================================================================
--- branches/rel-1/freevo/local_conf.py.example (original)
+++ branches/rel-1/freevo/local_conf.py.example Fri Jun 1 17:54:34 2007
@@ -1521,6 +1521,12 @@
# WWW_JAVASCRIPT = 'scripts/display_prog-head.js'
+# Integrate personal web pages into the web server
+# PERSONAL_WWW_PAGE = [
+# ('My Page', 'a single personal web page', 'page.html'),
+# ('My Site', 'site description', 'site/'),
+# ]
+
# ======================================================================
# Internal stuff, you shouldn't change anything here unless you know
Modified: branches/rel-1/freevo/src/www/web_types.py
==============================================================================
--- branches/rel-1/freevo/src/www/web_types.py (original)
+++ branches/rel-1/freevo/src/www/web_types.py Fri Jun 1 17:54:34 2007
@@ -201,14 +201,16 @@
(_('Favorites'),_('View Favorites'),'%sfavorites.rpy' %
str(strprefix)),
(_('Media Library'),_('View Media Library'),'%slibrary.rpy' %
str(strprefix)),
(_('Manual Recording'),_('Schedule a Manual
Recording'),'%smanualrecord.rpy' % str(strprefix)),
+ #(_('Sensors'),_('Sensors Page'),'%duncan.html' %
str(strprefix)),
(_('Search'),_('Advanced Search Page'),'%ssearch.rpy' %
str(strprefix)),
(_('Help'),_('View Online Help and Documentation'),'%shelp/'
% str(strprefix))]
- # maybe also the ICECAST_WWW_PAGE
- try:
- if config.ICECAST_WWW_PAGE:
- items.append((_('Icecast List'),_('Change Icecast
List'),'%siceslistchanger.rpy' % (strprefix)))
- except AttributeError:
- pass
+ print 'DJW:items:', items
+ # maybe also a personal web pages
+ if hasattr(config, 'PERSONAL_WWW_PAGE'):
+ for page in config.PERSONAL_WWW_PAGE:
+ items.append((page[0], page[1], '%s%s' % (str(strprefix),
page[2])))
+ if hasattr(config, 'ICECAST_WWW_PAGE') and config.ICECAST_WWW_PAGE:
+ items.append((_('Icecast List'),_('Change Icecast
List'),'%siceslistchanger.rpy' % (strprefix)))
# go through the items and create the bar
for i in items:
if selected == i[0]:
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
