Index: typo3/template.php
===================================================================
--- typo3/template.php	(Revision 9067)
+++ typo3/template.php	(Arbeitskopie)
@@ -1859,183 +1859,10 @@
 	 * @param	boolean		If set, there will be no button for swapping page.
 	 * @return	void
 	 */
-	function getVersionSelector($id,$noAction=FALSE)	{
-
-		if ($id>0)	{
-			if (t3lib_extMgm::isLoaded('version') && $GLOBALS['BE_USER']->workspace==0)	{
-
-					// Get Current page record:
-				$curPage = t3lib_BEfunc::getRecord('pages',$id);
-					// If the selected page is not online, find the right ID
-				$onlineId = ($curPage['pid']==-1 ? $curPage['t3ver_oid'] : $id);
-					// Select all versions of online version:
-				$versions = t3lib_BEfunc::selectVersionsOfRecord('pages', $onlineId, 'uid,pid,t3ver_label,t3ver_oid,t3ver_wsid,t3ver_id');
-
-					// If more than one was found...:
-				if (count($versions)>1)	{
-					$selectorLabel = '<strong>' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:versionSelect.label', TRUE) . '</strong>';
-
-						// Create selector box entries:
-					$opt = array();
-					foreach($versions as $vRow)	{
-						if ($vRow['uid'] == $onlineId) {
-								//Live version
-							$label = '[' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:versionSelect.live', TRUE) . ']';
-						} else {
-							$label = $vRow['t3ver_label'] . ' (' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:versionId', TRUE) . ' ' . $vRow['t3ver_id'] .
-								($vRow['t3ver_wsid'] != 0 ? ' ' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:workspaceId', TRUE) . ' ' . $vRow['t3ver_wsid'] : '') . ')';
-						}
-
-						$opt[] = '<option value="' . htmlspecialchars(t3lib_div::linkThisScript(array('id' => $vRow['uid']))) . '"' .
-							($id == $vRow['uid'] ? ' selected="selected"' : '') . '>' .
-							htmlspecialchars($label) . '</option>';
-					}
-
-						// Add management link:
-					$management = '<input type="button" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.mgm', TRUE) . '" onclick="window.location.href=\'' .
-							htmlspecialchars($this->backPath . t3lib_extMgm::extRelPath('version') . 'cm1/index.php?table=pages&uid=' . $onlineId) . '\';" />';
-						// Create onchange handler:
-					$onChange = "window.location.href=this.options[this.selectedIndex].value;";
-
-						// Controls:
-					if ($id == $onlineId) {
-						$controls .= '<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/blinkarrow_left.gif','width="5" height="9"') .
-							' class="absmiddle" alt="" /> <strong>' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.online', TRUE) .
-							'</strong>';
-					} elseif (!$noAction) {
-						$controls .= '<a href="' . $this->issueCommand('&cmd[pages][' . $onlineId . '][version][swapWith]=' . $id .
-							'&cmd[pages][' . $onlineId . '][version][action]=swap', t3lib_div::linkThisScript(array('id' => $onlineId))) .
-							'" class="nobr">' . t3lib_iconWorks::getSpriteIcon('actions-version-swap-version', array(
-								'title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.swapPage', TRUE),
-								'style' => 'margin-left:5px;vertical-align:bottom;'
-							)) . '<strong>' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.swap', TRUE) . '</strong></a>';
-					}
-
-						// Write out HTML code:
-					return '
-
-						<!--
-							Version selector:
-						-->
-						<table border="0" cellpadding="0" cellspacing="0" id="typo3-versionSelector">
-							<tr>
-								<td>' . $selectorLabel . '</td>
-								<td>
-									<select onchange="' . htmlspecialchars($onChange) . '">
-										' . implode('', $opt) . '
-									</select></td>
-								<td>' . $controls . '</td>
-								<td>' . $management . '</td>
-							</tr>
-						</table>
-					';
-				}
-			} elseif ($GLOBALS['BE_USER']->workspace !== 0) {
-
-					// Write out HTML code:
-				switch($GLOBALS['BE_USER']->workspace) {
-					case 0:
-						$wsTitle = $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:live', TRUE);
-					break;
-					case -1:
-						$wsTitle = $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:draft', TRUE);
-					break;
-					default:
-						$wsTitle = $GLOBALS['BE_USER']->workspaceRec['title'];
-					break;
-				}
-
-				if (t3lib_BEfunc::isPidInVersionizedBranch($id) == 'branchpoint') {
-					return '
-
-						<!--
-							Version selector:
-						-->
-						<table border="0" cellpadding="0" cellspacing="0" id="typo3-versionSelector">
-							<tr>
-								<td>' . $selectorLabel . '</td>
-								<td>Workspace: "' . htmlspecialchars($wsTitle) . '"</td>
-								<td><em>' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:versionSelect.inBranch', TRUE) . '</em></td>
-							</tr>
-						</table>
-					';
-				} else {
-						// Get Current page record:
-					$curPage = t3lib_BEfunc::getRecord('pages', $id);
-						// If the selected page is not online, find the right ID
-					$onlineId = ($curPage['pid']==-1 ? $curPage['t3ver_oid'] : $id);
-						// The version of page:
-					$verPage = t3lib_BEfunc::getWorkspaceVersionOfRecord($GLOBALS['BE_USER']->workspace, 'pages', $onlineId);
-
-					if (!$verPage) {
-
-						if (!count(t3lib_BEfunc::countVersionsOfRecordsOnPage($GLOBALS['BE_USER']->workspace, $onlineId))) {
-							if ($GLOBALS['BE_USER']->workspaceVersioningTypeAccess(0)) {
-
-								$onClick = $this->issueCommand('&cmd[pages][' . $onlineId . '][version][action]=new&cmd[pages][' . $onlineId . '][version][treeLevels]=0',
-									t3lib_div::linkThisScript(array(
-										'id' => $onlineId
-									)));
-								$onClick = 'window.location.href=\'' . $onClick . '\'; return false;';
-									// Write out HTML code:
-								return '
-
-									<!--
-										No version yet, create one?
-									-->
-									<table border="0" cellpadding="0" cellspacing="0" id="typo3-versionSelector">
-										<tr>
-											<td>' . $selectorLabel . '</td>
-											<td>' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:workspace', TRUE) . ': "' . htmlspecialchars($wsTitle) . '"</td>
-											<td>
-												<input type="button" value="New version of page" name="_" onclick="' . htmlspecialchars($onClick) . '" /></td>
-										</tr>
-									</table>
-								';
-							}
-						} elseif ($GLOBALS['TYPO3_CONF_VARS']['BE']['elementVersioningOnly'] == FALSE && $GLOBALS['TYPO3_CONF_VARS']['BE']['newPagesVersioningType'] == 0) {
-								// only add this info if old/deprecated newPagesVersioning is allowed
-							return '
-
-								<!--
-									Version selector:
-								-->
-								<table border="0" cellpadding="0" cellspacing="0" id="typo3-versionSelector">
-									<tr>
-										<td>' . $selectorLabel . '</td>
-										<td>' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:workspace', TRUE) . ': "' . htmlspecialchars($wsTitle) . '"</td>
-										<td><em>' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:versionSelect.versionsFound', TRUE) . '</em></td>
-									</tr>
-								</table>
-							';
-						}
-					} elseif ($verPage['t3ver_swapmode']==0) {
-						$onClick = $this->issueCommand('&cmd[pages][' . $onlineId . '][version][action]=swap&cmd[pages][' .
-							$onlineId . '][version][swapWith]=' . $verPage['uid'],
-							t3lib_div::linkThisScript(array(
-								'id' => $onlineId
-							)));
-						$onClick = 'window.location.href=\'' . $onClick . '\'; return false;';
-
-							// Write out HTML code:
-						return '
-
-							<!--
-								Version selector:
-							-->
-							<table border="0" cellpadding="0" cellspacing="0" id="typo3-versionSelector">
-								<tr>
-									<td>' . $selectorLabel . '</td>
-									<td>' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:workspace', TRUE) . ': "' . htmlspecialchars($wsTitle) . '"</td>
-									<td>
-										<input type="button" value="' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:versionSelect.publish', TRUE) .
-											'" onclick="' . htmlspecialchars($onClick) . '" /></td>
-								</tr>
-							</table>
-						';
-					}
-				}
-			}
+	public function getVersionSelector($id, $noAction = FALSE) {
+		if (t3lib_extMgm::isLoaded('version')) {
+			$versionGuiObj = t3lib_div::makeInstance('tx_version_gui');
+			return $versionGuiObj->getVersionSelector($id, $noAction);
 		}
 	}
 
Index: typo3/sysext/version/class.tx_version_gui.php
===================================================================
--- typo3/sysext/version/class.tx_version_gui.php	(Revision 0)
+++ typo3/sysext/version/class.tx_version_gui.php	(Revision 0)
@@ -0,0 +1,227 @@
+<?php
+/***************************************************************
+*  Copyright notice
+*
+*  (c) 1999-2010 Kasper Skårhøj (kasperYYYY@typo3.com)
+*  (c) 2010 Benjamin Mack (benni@typo3.org)
+* 
+*  All rights reserved
+*
+*  This script is part of the TYPO3 project. The TYPO3 project 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 2 of the License, or
+*  (at your option) any later version.
+*
+*  The GNU General Public License can be found at
+*  http://www.gnu.org/copyleft/gpl.html.
+*  A copy is found in the textfile GPL.txt and important notices to the license
+*  from the author is found in LICENSE.txt distributed with these scripts.
+*
+*
+*  This script 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.
+*
+*  This copyright notice MUST APPEAR in all copies of the script!
+***************************************************************/
+/**
+ *
+ * Contains some parts for staging, versioning and workspaces
+ * to interact with the TYPO3 Core Engine
+ *
+ */
+class tx_version_gui {
+
+	/**
+	 * Creates the version selector for the page id inputted.
+	 * Moved out of the core file typo3/template.php
+	 *
+	 * @param	integer		Page id to create selector for.
+	 * @param	boolean		If set, there will be no button for swapping page.
+	 * @return	void
+	 */
+	public function getVersionSelector($id, $noAction = FALSE) {
+		if ($id <= 0) {
+			return;
+		}
+		if ($GLOBALS['BE_USER']->workspace == 0) {
+
+				// Get Current page record:
+			$curPage = t3lib_BEfunc::getRecord('pages', $id);
+				// If the selected page is not online, find the right ID
+			$onlineId = ($curPage['pid']==-1 ? $curPage['t3ver_oid'] : $id);
+				// Select all versions of online version:
+			$versions = t3lib_BEfunc::selectVersionsOfRecord('pages', $onlineId, 'uid,pid,t3ver_label,t3ver_oid,t3ver_wsid,t3ver_id');
+
+				// If more than one was found...:
+			if (count($versions) > 1) {
+				$selectorLabel = '<strong>' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:versionSelect.label', TRUE) . '</strong>';
+
+					// Create selector box entries:
+				$opt = array();
+				foreach ($versions as $vRow) {
+					if ($vRow['uid'] == $onlineId) {
+							// Live version
+						$label = '[' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:versionSelect.live', TRUE) . ']';
+					} else {
+						$label = $vRow['t3ver_label'] . ' (' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:versionId', TRUE) . ' ' . $vRow['t3ver_id'] .
+							($vRow['t3ver_wsid'] != 0 ? ' ' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:workspaceId', TRUE) . ' ' . $vRow['t3ver_wsid'] : '') . ')';
+					}
+
+					$opt[] = '<option value="' . htmlspecialchars(t3lib_div::linkThisScript(array('id' => $vRow['uid']))) . '"' .
+						($id == $vRow['uid'] ? ' selected="selected"' : '') . '>' .
+						htmlspecialchars($label) . '</option>';
+				}
+
+					// Add management link:
+				$management = '<input type="button" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.mgm', TRUE) . '" onclick="window.location.href=\'' .
+						htmlspecialchars($GLOBALS['TBE_TEMPLATE']->backPath . t3lib_extMgm::extRelPath('version') . 'cm1/index.php?table=pages&uid=' . $onlineId) . '\';" />';
+					// Create onchange handler:
+				$onChange = "window.location.href=this.options[this.selectedIndex].value;";
+
+					// Controls:
+				if ($id == $onlineId) {
+					$controls .= '<img' . t3lib_iconWorks::skinImg($GLOBALS['TBE_TEMPLATE']->backPath, 'gfx/blinkarrow_left.gif','width="5" height="9"') .
+						' class="absmiddle" alt="" /> <strong>' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.online', TRUE) .
+						'</strong>';
+				} elseif (!$noAction) {
+					$controls .= '<a href="' . $GLOBALS['TBE_TEMPLATE']->issueCommand('&cmd[pages][' . $onlineId . '][version][swapWith]=' . $id .
+						'&cmd[pages][' . $onlineId . '][version][action]=swap', t3lib_div::linkThisScript(array('id' => $onlineId))) .
+						'" class="nobr">' . t3lib_iconWorks::getSpriteIcon('actions-version-swap-version', array(
+							'title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.swapPage', TRUE),
+							'style' => 'margin-left:5px;vertical-align:bottom;'
+						)) . '<strong>' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:ver.swap', TRUE) . '</strong></a>';
+				}
+
+					// Write out HTML code:
+				return '
+					<!--
+						Version selector:
+					-->
+					<table border="0" cellpadding="0" cellspacing="0" id="typo3-versionSelector">
+						<tr>
+							<td>' . $selectorLabel . '</td>
+							<td>
+								<select onchange="' . htmlspecialchars($onChange) . '">
+									' . implode('', $opt) . '
+								</select></td>
+							<td>' . $controls . '</td>
+							<td>' . $management . '</td>
+						</tr>
+					</table>
+				';
+			}
+		} elseif ($GLOBALS['BE_USER']->workspace !== 0) {
+
+				// Write out HTML code:
+			switch ($GLOBALS['BE_USER']->workspace) {
+				case 0:
+					$wsTitle = $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:live', TRUE);
+				break;
+				case -1:
+					$wsTitle = $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:draft', TRUE);
+				break;
+				default:
+					$wsTitle = $GLOBALS['BE_USER']->workspaceRec['title'];
+				break;
+			}
+
+			if (t3lib_BEfunc::isPidInVersionizedBranch($id) == 'branchpoint') {
+				return '
+
+					<!--
+						Version selector:
+					-->
+					<table border="0" cellpadding="0" cellspacing="0" id="typo3-versionSelector">
+						<tr>
+							<td>' . $selectorLabel . '</td>
+							<td>Workspace: "' . htmlspecialchars($wsTitle) . '"</td>
+							<td><em>' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:versionSelect.inBranch', TRUE) . '</em></td>
+						</tr>
+					</table>
+				';
+			} else {
+
+					// Get Current page record:
+				$curPage = t3lib_BEfunc::getRecord('pages', $id);
+					// If the selected page is not online, find the right ID
+				$onlineId = ($curPage['pid']==-1 ? $curPage['t3ver_oid'] : $id);
+					// The version of page:
+				$verPage = t3lib_BEfunc::getWorkspaceVersionOfRecord($GLOBALS['BE_USER']->workspace, 'pages', $onlineId);
+
+				if (!$verPage) {
+
+					if (!count(t3lib_BEfunc::countVersionsOfRecordsOnPage($GLOBALS['BE_USER']->workspace, $onlineId))) {
+						if ($GLOBALS['BE_USER']->workspaceVersioningTypeAccess(0)) {
+
+							$onClick = $GLOBALS['TBE_TEMPLATE']->issueCommand('&cmd[pages][' . $onlineId . '][version][action]=new&cmd[pages][' . $onlineId . '][version][treeLevels]=0',
+								t3lib_div::linkThisScript(array(
+									'id' => $onlineId
+								)));
+							$onClick = 'window.location.href=\'' . $onClick . '\'; return false;';
+								// Write out HTML code:
+							return '
+
+								<!--
+									No version yet, create one?
+								-->
+								<table border="0" cellpadding="0" cellspacing="0" id="typo3-versionSelector">
+									<tr>
+										<td>' . $selectorLabel . '</td>
+										<td>' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:workspace', TRUE) . ': "' . htmlspecialchars($wsTitle) . '"</td>
+										<td>
+											<input type="button" value="New version of page" name="_" onclick="' . htmlspecialchars($onClick) . '" /></td>
+									</tr>
+								</table>
+							';
+						}
+					} elseif ($GLOBALS['TYPO3_CONF_VARS']['BE']['elementVersioningOnly'] == FALSE && $GLOBALS['TYPO3_CONF_VARS']['BE']['newPagesVersioningType'] == 0) {
+							// only add this info if old/deprecated newPagesVersioning is allowed
+						return '
+
+							<!--
+								Version selector:
+							-->
+							<table border="0" cellpadding="0" cellspacing="0" id="typo3-versionSelector">
+								<tr>
+									<td>' . $selectorLabel . '</td>
+									<td>' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:workspace', TRUE) . ': "' . htmlspecialchars($wsTitle) . '"</td>
+									<td><em>' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:versionSelect.versionsFound', TRUE) . '</em></td>
+								</tr>
+							</table>
+						';
+					}
+				} elseif ($verPage['t3ver_swapmode']==0) {
+					$onClick = $GLOBALS['TBE_TEMPLATE']->issueCommand('&cmd[pages][' . $onlineId . '][version][action]=swap&cmd[pages][' .
+						$onlineId . '][version][swapWith]=' . $verPage['uid'],
+						t3lib_div::linkThisScript(array(
+							'id' => $onlineId
+						)));
+					$onClick = 'window.location.href=\'' . $onClick . '\'; return false;';
+
+						// Write out HTML code:
+					return '
+
+						<!--
+							Version selector:
+						-->
+						<table border="0" cellpadding="0" cellspacing="0" id="typo3-versionSelector">
+							<tr>
+								<td>' . $selectorLabel . '</td>
+								<td>' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:workspace', TRUE) . ': "' . htmlspecialchars($wsTitle) . '"</td>
+								<td>
+									<input type="button" value="' . $GLOBALS['LANG']->sL('LLL:EXT:version/locallang.xml:versionSelect.publish', TRUE) .
+										'" onclick="' . htmlspecialchars($onClick) . '" /></td>
+							</tr>
+						</table>
+					';
+				}
+			}
+		}
+	}
+	
+}
+
+?>
\ No newline at end of file
Index: typo3/sysext/version/ext_autoload.php
===================================================================
--- typo3/sysext/version/ext_autoload.php	(Revision 9067)
+++ typo3/sysext/version/ext_autoload.php	(Arbeitskopie)
@@ -5,6 +5,7 @@
  * $Id: ext_autoload.php 6536 2009-11-25 14:07:18Z stucki $
  */
 return array(
-	'tx_version_tasks_autopublish' => t3lib_extMgm::extPath('version', 'tasks/class.tx_version_tasks_autopublish.php')
+	'tx_version_tasks_autopublish' => t3lib_extMgm::extPath('version', 'tasks/class.tx_version_tasks_autopublish.php'),
+	'tx_version_gui' => t3lib_extMgm::extPath('version', 'class.tx_version_gui.php')
 );
 ?>