Merge lp:~dangarner/xibo/client-140 into lp:~xibo-maintainers/xibo/d-arrest

[Dan Garner]

=== modified file 'client/dotNET/Properties/Settings.Designer.cs'
--- client/dotNET/Properties/Settings.Designer.cs	2012-09-05 20:34:12 +0000
+++ client/dotNET/Properties/Settings.Designer.cs	2012-10-27 12:53:21 +0000
@@ -271,7 +271,11 @@
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+<<<<<<< TREE
         [global::System.Configuration.DefaultSettingValueAttribute("1.4.0rc1")]
+=======
+        [global::System.Configuration.DefaultSettingValueAttribute("1.4.0")]
+>>>>>>> MERGE-SOURCE
         public string ClientVersion {
             get {
                 return ((string)(this["ClientVersion"]));

=== modified file 'client/dotNET/Properties/Settings.settings'
--- client/dotNET/Properties/Settings.settings	2012-09-05 20:34:12 +0000
+++ client/dotNET/Properties/Settings.settings	2012-10-27 12:53:21 +0000
@@ -69,7 +69,11 @@
       <Value Profile="(Default)">cacheManager.xml</Value>
     </Setting>
     <Setting Name="ClientVersion" Type="System.String" Scope="Application">
+<<<<<<< TREE
       <Value Profile="(Default)">1.4.0rc1</Value>
+=======
+      <Value Profile="(Default)">1.4.0</Value>
+>>>>>>> MERGE-SOURCE
     </Setting>
     <Setting Name="scrollStepAmount" Type="System.Decimal" Scope="User">
       <Value Profile="(Default)">1</Value>

=== modified file 'client/dotNET/app.config'
--- client/dotNET/app.config	2012-09-05 20:34:12 +0000
+++ client/dotNET/app.config	2012-10-27 12:53:21 +0000
@@ -135,7 +135,11 @@
                 <value>cacheManager.xml</value>
             </setting>
             <setting name="ClientVersion" serializeAs="String">
+<<<<<<< TREE
                 <value>1.4.0rc1</value>
+=======
+                <value>1.4.0</value>
+>>>>>>> MERGE-SOURCE
             </setting>
             <setting name="xmdsResetTimeout" serializeAs="String">
                 <value>900</value>
@@ -148,4 +152,12 @@
             </setting>
         </XiboClient.Properties.Settings>
     </applicationSettings>
-<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
+	<startup>
+		<supportedRuntime version="v2.0.50727"/>
+	</startup>
+	<system.net>
+		<settings>
+			<servicePointManager expect100Continue="false" />
+		</settings>
+	</system.net>
+</configuration>

=== modified file 'client/offline/XiboOfflineDownload.py'
--- client/offline/XiboOfflineDownload.py	2012-10-25 22:45:25 +0000
+++ client/offline/XiboOfflineDownload.py	2012-10-27 12:53:21 +0000
@@ -21,7 +21,11 @@
 # along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
 
 # Static Variables
+<<<<<<< TREE
 VERSION = '1.5.0'
+=======
+VERSION = '1.4.0'
+>>>>>>> MERGE-SOURCE
 APP_NAME = 'Xibo Offline Download Client'
 
 # Imports

=== modified file 'client/python-installer/xibo-1.4.0-ubuntu.all-pyclient.sh' (properties changed: +x to -x)
--- client/python-installer/xibo-1.4.0-ubuntu.all-pyclient.sh	2012-10-25 22:58:14 +0000
+++ client/python-installer/xibo-1.4.0-ubuntu.all-pyclient.sh	2012-10-27 12:53:21 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 #!/bin/bash
 
 set -e
@@ -267,3 +268,274 @@
 
 		;;
  esac
+=======
+#!/bin/bash
+
+set -e
+
+#    Script by Brian Mathis - http://www.brianmathis.net (c) 2012
+#    This script will update, download, and install the Python
+#    client for use with Xibo - Open Source Digital Signage
+
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see http://www.gnu.org/licenses
+
+#######################################################################
+###
+### Version 1.4.0 - 10/24/2012
+### Changelog
+###
+### 1. Updated to use 1.4 branch of Xibo
+### 
+### Version 1.3.3 - 8/16/2011
+### Changelog
+###
+### 1. Removed support for 9.10
+### 2. Added support for 11.10
+### 3. Added libvdpau1 dependency
+### 4. Changed binary tar download
+### 5. Changed pulled version to 1.3
+### 6. Removed running configuration utility (broken)
+### 
+### Version 1.3.2 - 2/14/2011
+### Changelog
+###
+### 1. Added an option to run the configuration utility
+### 2. Installing a new client will now run the configuration utility after client is installed
+### 3. Changed bzr to pull from xibo/1.2
+###
+### Version 1.3.1 - 2/8/2011
+### Changelog
+###
+### 1. Changed folder check directory to /opt/xibo/pyclient
+### 2. Moved folder check to the beginning of install to stop script before downloading and packages
+### 3. Added the -p option to continue if /opt/xibo exists
+### 4. Checks if /opt/xibo/pyclient exists before attempting to update client
+### 5. Added error if dir doesnt exist when updating
+### 
+### Version 1.3 - 1/29/2011
+### Changelog
+###
+### 1. Added support for 11.04.
+### 2. Added command to stop script on any error.
+### 3. Added case menu to select install or update.
+### 4. Checks if /opt/xibo already exists. If it does, the script will exit.
+### 5. If updating, creates a backup of site.cfg, just in case.
+### 
+#######################################################################
+
+# Checks to ensure the user is running as root since we will be making system wide changes
+
+if [ ! "`whoami`" = "root" ]; then
+		echo " "
+		echo "========================================================"
+		echo " This script must be run as root or with sudo... Exiting"
+		echo "========================================================" 1>&2
+		sleep 3
+	exit 1
+fi
+
+echo " "
+echo "========================================================"
+echo " Xibo Python Client Installation Script v1.3"
+echo " Ubuntu 9.04, 9.10, 10.04, 10.10, & 11.04"
+echo " Script by Brian Mathis - http://www.brianmathis.net (c)2010-2011"
+echo " This script will update, download, and install the Python"
+echo " client for use with Xibo - Open Source Digital Signage"
+echo "========================================================"
+echo " "
+echo "Please select an option to continue..."
+echo " "
+echo "   [1] Install new client"
+echo "   [2] Update client"
+## echo "   [3] Run Configuration Utility"
+echo "   [q] Quit"
+echo " "
+echo " "
+
+read OPTION
+
+	case "$OPTION" in
+		"1")
+
+			# Stops the script if dir already exists. 
+			if [ -d "/opt/xibo/pyclient" ]; then 
+
+				echo "Error: /opt/xibo already exists. If you would like to upgrade"
+				echo "your client, please choose option 2. Otherwise, please check"
+				echo "the directory and try again."
+				exit 1
+
+			else
+
+				# Creates dir
+				mkdir -p /opt/xibo 
+
+			fi
+
+			# Check which version of Ubuntu the user is running and then selects what to do
+			codename=`lsb_release -c | awk '{print $2}'`
+
+			if [ "$codename" = "jaunty" ];
+
+				then	echo "Ubuntu 9.04 is no longer officially supported by Canonical, please use Ubuntu 10.04" && exit 1
+
+			elif [ "$codename" = "karmic" ];
+
+				then	echo "Ubuntu 9.10 is no longer officially supported by Canonical, please use Ubuntu 10.04" && exit 1
+
+			elif [ "$codename" = "lucid" ]
+
+				then
+					echo " "
+					echo "========================================================"
+					echo " Installing Xibo Python Client for Ubuntu 10.04"
+					echo " Required packages and binaries will now be installed"
+					echo "========================================================"
+					echo " "
+
+					# Updates the package manager
+					apt-get update > /dev/null
+
+					# downloads the required files per http://wiki.xibo.org.uk/wiki/Install_Guide_Python_Client#Ubuntu_10.04_and_derivatives
+					apt-get install -y libboost-python1.40.0 libboost-thread1.40.0 libdc1394-22 libgtk2.0-0 libavutil49 bzr python-soappy python-feedparser python-serial flashplugin-nonfree libavcodec52 libavformat52 libswscale0 libsdl1.2debian-pulseaudio libvdpau1 > /dev/null
+
+					# downloads the binary files that Alex Harrington put together
+
+					wget http://launchpad.net/xibo/1.4/1.4.0/+download/libavg-1.7.1-vdpau-berkelium11.tar.gz
+
+
+			elif [ "$codename" = "maverick" ]
+
+				then 	echo "Ubuntu 10.10 is not supported by Xibo, please us 10.04" && exit 1
+
+
+			elif [ "$codename" = "natty" ]
+
+				then	echo "Ubuntu 11.04 is not yet supported by Xibo, please us 10.04" && exit 1
+
+			elif [ "$codename" = "Oneiric" ]
+
+				then 	echo "Ubuntu 11.10 is not supported by Xibo, please use 10.04" && exit 1
+
+			else
+
+				echo "Error: I cannot determine your version of Ubuntu." && exit 1
+
+			fi
+
+
+			# extracts the tar to /
+			tar xf libavg-* -C /
+
+			# removes tar file after extract
+			rm libavg-*
+
+			# runs ldconfig
+			ldconfig
+
+			# moves to dir and downloads pyclient
+			# cd /opt/xibo && bzr branch http://bazaar.launchpad.net/~xibo-maintainers/xibo/biela 
+			cd /opt/xibo && bzr branch lp:xibo/1.4 pyclient
+
+			## renames the directory
+			# mv biela pyclient
+
+			# grants 777 read/write permissions to all
+			chmod -R 777 /opt/xibo
+
+			# opens configuration client by Matt Holder
+			# cd /opt/xibo/pyclient/client/python/ && ./configure.py
+
+			echo " "
+			echo "========================================================"
+			echo " All done. Navigate to /opt/xibo/pyclient/client/python"
+			echo " to make changes to site.cfg "
+			echo " For more info on the Python client, visit: "
+			echo " http://wiki.xibo.org.uk/wiki/Install_Guide_Python_Client"
+			echo "========================================================"
+			echo " "
+
+			sleep 3
+
+		;;
+
+		"2")
+	
+			# Checks to make sure Xibo is in /opt/xibo/pyclient. 
+			if [ -d "/opt/xibo/pyclient" ]; then 
+
+				echo " "		
+				echo "========================================================"
+				echo " Creating a backup of site.cfg and updating the"
+				echo " Xibo bzr branch. "
+				echo "========================================================"
+				echo " "
+	
+				sleep 3
+
+				# Before pulling, make a backup of site.cfg
+				cp /opt/xibo/pyclient/client/python/site.cfg /opt/xibo/pyclient/client/python/site.cfg.backup
+
+				# Move to the install dir
+				cd /opt/xibo/pyclient
+
+				# Pull the latest and greatest from bzr
+				bzr pull > /dev/null
+
+				echo " "
+				echo " "
+				echo "========================================================"
+				echo " Done updating your client."
+				echo "========================================================"
+				echo " "
+
+				sleep 3
+	
+			else
+
+				echo " "
+				echo "Error: /opt/xibo/pyclient does not exist. Was it installed somewhere else?"
+				echo " "
+
+			fi
+
+		;;
+
+		## "3")
+	
+			## Checks to make sure Xibo is in /opt/xibo/pyclient/client/python
+			## if [ -f "/opt/xibo/pyclient/client/python/configure.py" ]; then 
+
+				## cd /opt/xibo/pyclient/client/python/ && ./configure.py
+
+			## else
+
+				## echo " "
+				## echo "Error: configure.py does not appear to exsist in /opt/xibo/pyclient/client/python"
+				## echo " "
+		
+			## fi
+
+		## ;;
+
+		"Q"|"q")
+
+			echo " "
+			echo "Thanks for using Xibo - Open Source Digital Signage"
+			echo " "
+			echo " "
+
+		;;
+ esac
+>>>>>>> MERGE-SOURCE

=== modified file 'client/python/XiboClient.py'
--- client/python/XiboClient.py	2012-10-25 22:45:25 +0000
+++ client/python/XiboClient.py	2012-10-27 12:53:21 +0000
@@ -50,7 +50,11 @@
 
 from ThirdParty.period.period import in_period
 
+<<<<<<< TREE
 version = "1.5.0"
+=======
+version = "1.4.0"
+>>>>>>> MERGE-SOURCE
 
 # What layout schema version is supported
 schemaVersion = 1

=== modified file 'client/python/plugins/media/BrowserMediaAnimatedBase.py'
--- client/python/plugins/media/BrowserMediaAnimatedBase.py	2012-07-09 17:59:26 +0000
+++ client/python/plugins/media/BrowserMediaAnimatedBase.py	2012-10-27 12:53:21 +0000
@@ -103,7 +103,7 @@
             self.fitText = 'false'
             self.scaleText = 'true'
         else:
-            self.fitTest = 'true'
+            self.fitText = 'true'
             self.scaleText = 'false'
 
         

=== added file 'server/install/database/49.sql'
--- server/install/database/49.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/49.sql	2012-10-27 12:53:21 +0000
@@ -0,0 +1,4 @@
+
+UPDATE `version` SET `app_ver` = '1.4.0-rc1', `XmdsVersion` = 3;
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '49';
\ No newline at end of file

=== renamed file 'server/install/database/49.sql' => 'server/install/database/49.sql.moved'
=== added file 'server/install/database/50.sql'
--- server/install/database/50.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/50.sql	2012-10-27 12:53:21 +0000
@@ -0,0 +1,4 @@
+
+UPDATE `version` SET `app_ver` = '1.4.0', `XmdsVersion` = 3;
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '50';
\ No newline at end of file

=== modified file 'server/lib/include.php'
--- server/lib/include.php	2012-09-16 15:52:24 +0000
+++ server/lib/include.php	2012-10-27 12:53:21 +0000
@@ -108,8 +108,13 @@
 Config::Version($db);
 
 // Does the version in the DB match the version of the code?
+<<<<<<< TREE
 if (DBVERSION != '60')
     die(sprintf('Incompatible database version detected. Please ensure your database and website versions match. You have %d and the website for %d', DBVERSION, 60));
+=======
+if (DBVERSION != '50')
+    die(sprintf('Incompatible database version detected. Please ensure your database and website versions match. You have %d and the website for %d', DBVERSION, 50));
+>>>>>>> MERGE-SOURCE
 
 // What is the production mode of the server?
 if(Config::GetSetting($db, 'SERVER_MODE') == 'Test') ini_set('display_errors', 1);

=== modified file 'server/lib/pages/content.class.php'
--- server/lib/pages/content.class.php	2012-09-27 14:04:35 +0000
+++ server/lib/pages/content.class.php	2012-10-27 12:53:21 +0000
@@ -104,7 +104,17 @@
 		
 		$type_list =  dropdownlist($sql, 'mediatype', $mediatype);
 		
+<<<<<<< TREE
                 // Filter
+=======
+		// Messages
+		$msgName	= __('Name');
+		$msgType	= __('Type');
+		$msgRetired	= __('Retired');
+		$msgOwner	= __('Owner');
+                $msgShowOriginal = __('Show the original file name for each media item?');
+
+>>>>>>> MERGE-SOURCE
 		$filterForm = <<<END
 			<div class="FilterDiv" id="LibraryFilter">
 				<form>
@@ -164,8 +174,13 @@
 		$shared 		= Kit::GetParam('shared', _REQUEST, _STRING);
 		$filter_userid 	= Kit::GetParam('filter_userid', _REQUEST, _STRING, 'all');
 		$filter_retired = Kit::GetParam('filter_retired', _REQUEST, _STRING, 'all');
+<<<<<<< TREE
                 $filterShowOriginal = Kit::GetParam('filter_showOriginal', _REQUEST, _CHECKBOX, 'off');
                 
+=======
+                $filterShowOriginal = Kit::GetParam('filter_showOriginal', _REQUEST, _CHECKBOX, 'off');
+		
+>>>>>>> MERGE-SOURCE
 		setSession('content', 'mediatype', $mediatype);
 		setSession('content', 'name', $name);
 		setSession('content', 'shared', $shared);

=== modified file 'server/lib/pages/user.class.php'
=== modified file 'server/modules/module_user_general.php'