Index: ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.js
===================================================================
--- ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.js	(revision 20598)
+++ ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.js	(revision 20599)
@@ -1,336 +1,351 @@
 /**
  * Contains JS objects defined by the mod JSON files available.
  * @example
  *{
  *	"public":
  *	{
  *		"name": "0ad",
  *		"version": "0.0.16",
  *		"label": "0 A.D. - Empires Ascendant",
  *		"url": "http://wildfregames.com/",
  *		"description": "A free, open-source, historical RTS game.",
  *		"dependencies": []
  *	},
  *	"foldername2": {
  *		"name": "mod2",
  *		"label": "Mod 2",
  *		"version": "1.1",
  *		"description": "",
  *		"dependencies": ["0ad<=0.0.16", "rote"]
  *	}
  *}
  */
 var g_Mods = {};
 
 /**
  * Every mod needs to define these properties.
  */
 var g_RequiredProperties = ["name", "label", "description", "dependencies", "version"];
 
 /**
  * Version checks in mod dependencies can use these operators.
  */
 var g_CompareVersion = /(<=|>=|<|>|=)/;
 
 /**
  * Folder names of all mods that are or can be launched.
  */
 var g_ModsEnabled = [];
 var g_ModsDisabled = [];
 
 var g_ColorNoModSelected = "255 255 100";
 var g_ColorDependenciesMet = "100 255 100";
 var g_ColorDependenciesNotMet = "255 100 100";
 
 function init()
 {
 	loadMods();
 	initGUIFilters();
 }
 
 function loadMods()
 {
 	let mods = Engine.GetAvailableMods();
 
 	for (let folder in mods)
 		if (g_RequiredProperties.every(prop => mods[folder][prop] !== undefined))
 			g_Mods[folder] = mods[folder];
 		else
 			warn("Skipping mod '" + mod + "' which does not define '" + property + "'.");
 
 	deepfreeze(g_Mods);
 
 	g_ModsEnabled = Engine.ConfigDB_GetValue("user", "mod.enabledmods").split(/\s+/).filter(folder => !!g_Mods[folder]);
 	g_ModsDisabled = Object.keys(g_Mods).filter(folder => g_ModsEnabled.indexOf(folder) == -1);
 }
 
 function initGUIFilters()
 {
 	Engine.GetGUIObjectByName("negateFilter").checked = false;
 	Engine.GetGUIObjectByName("modGenericFilter").caption = translate("Filter");
 
 	displayModLists();
 }
 
 function saveMods()
 {
 	sortEnabledMods();
 	Engine.ConfigDB_CreateValue("user", "mod.enabledmods", ["mod"].concat(g_ModsEnabled).join(" "));
 	Engine.ConfigDB_WriteFile("user", "config/user.cfg");
 }
 
 function startMods()
 {
 	sortEnabledMods();
 	Engine.SetMods(["mod"].concat(g_ModsEnabled));
 	Engine.RestartEngine();
 }
 
 function displayModLists()
 {
 	displayModList("modsEnabledList", g_ModsEnabled);
 	displayModList("modsDisabledList", g_ModsDisabled);
 }
 
 function displayModList(listObjectName, folders)
 {
 	let listObject = Engine.GetGUIObjectByName(listObjectName);
 
 	if (listObjectName == "modsDisabledList")
 	{
 		let sortFolder = folder => String(g_Mods[folder][listObject.selected_column] || folder);
 		folders.sort((folder1, folder2) =>
 			listObject.selected_column_order *
 			sortFolder(folder1).localeCompare(sortFolder(folder2)));
 	}
 
 	folders = folders.filter(filterMod);
 
 	listObject.list_name = folders.map(folder => g_Mods[folder].name);
 	listObject.list_folder = folders;
 	listObject.list_label = folders.map(folder => g_Mods[folder].label);
 	listObject.list_url = folders.map(folder => g_Mods[folder].url || "");
 	listObject.list_version = folders.map(folder => g_Mods[folder].version);
 	listObject.list_dependencies = folders.map(folder => g_Mods[folder].dependencies.join(" "));
 	listObject.list = folders;
 }
 
 function enableMod()
 {
 	let modsDisabledList = Engine.GetGUIObjectByName("modsDisabledList");
 	let pos = modsDisabledList.selected;
 
 	if (pos == -1 || !areDependenciesMet(g_ModsDisabled[pos]))
 		return;
 
 	g_ModsEnabled.push(g_ModsDisabled.splice(pos, 1)[0]);
 
 	if (pos >= g_ModsDisabled.length)
 		--pos;
 
 	modsDisabledList.selected = pos;
 
 	displayModLists();
 }
 
 function disableMod()
 {
 	let modsEnabledList = Engine.GetGUIObjectByName("modsEnabledList");
 	let pos = modsEnabledList.selected;
 	if (pos == -1)
 		return;
 
 	g_ModsDisabled.push(g_ModsEnabled.splice(pos, 1)[0]);
 
 	// Remove mods that required the removed mod and cascade
 	// Sort them, so we know which ones can depend on the removed mod
 	// TODO: Find position where the removed mod would have fit (for now assume idx 0)
 
 	sortEnabledMods();
 
 	for (let i = 0; i < g_ModsEnabled.length; ++i)
 		if (!areDependenciesMet(g_ModsEnabled[i]))
 		{
 			g_ModsDisabled.push(g_ModsEnabled.splice(i, 1)[0]);
 			--i;
 		}
 
 	modsEnabledList.selected = Math.min(pos, g_ModsEnabled.length - 1);
 
 	displayModLists();
 }
 
 function resetFilters()
 {
 	Engine.GetGUIObjectByName("modGenericFilter").caption = "";
 	Engine.GetGUIObjectByName("negateFilter").checked = false;
 	displayModLists();
 }
 
 function applyFilters()
 {
 	// Save selected rows
 	let modsDisabledList = Engine.GetGUIObjectByName("modsDisabledList");
 	let modsEnabledList = Engine.GetGUIObjectByName("modsEnabledList");
 
 	let selectedDisabledFolder = modsDisabledList.list_folder[modsDisabledList.selected];
 	let selectedEnabledFolder = modsEnabledList.list_folder[modsEnabledList.selected];
 
 	// Remove selected rows to prevent a link to a non existing item
 	modsDisabledList.selected = -1;
 	modsEnabledList.selected = -1;
 
 	displayModLists();
 
 	// Restore previously selected rows
 	modsDisabledList.selected = modsDisabledList.list_folder.indexOf(selectedDisabledFolder);
 	modsEnabledList.selected = modsEnabledList.list_folder.indexOf(selectedEnabledFolder);
 
 	Engine.GetGUIObjectByName("globalModDescription").caption = "";
 }
 
 function filterMod(folder)
 {
 	let mod = g_Mods[folder];
 
 	let negateFilter = Engine.GetGUIObjectByName("negateFilter").checked;
 	let searchText = Engine.GetGUIObjectByName("modGenericFilter").caption;
 
 	if (searchText &&
 	    searchText != translate("Filter") &&
 	    folder.indexOf(searchText) == -1 &&
 	    mod.name.indexOf(searchText) == -1 &&
 	    mod.label.indexOf(searchText) == -1 &&
 	    (mod.url || "").indexOf(searchText) == -1 &&
 	    mod.version.indexOf(searchText) == -1 &&
 	    mod.description.indexOf(searchText) == -1 &&
 	    mod.dependencies.indexOf(searchText) == -1)
 		return negateFilter;
 
 	return !negateFilter;
 }
 
 function closePage()
 {
 	Engine.SwitchGuiPage("page_pregame.xml", {});
 }
 
 /**
  * Moves an item in the list up or down.
  */
 function moveCurrItem(objectName, up)
 {
 	let obj = Engine.GetGUIObjectByName(objectName);
 	let idx = obj.selected;
 	if (idx == -1)
 		return;
 
 	let num = obj.list.length;
 	let idx2 = idx + (up ? -1 : 1);
 	if (idx2 < 0 || idx2 >= num)
 		return;
 
 	let tmp = g_ModsEnabled[idx];
 	g_ModsEnabled[idx] = g_ModsEnabled[idx2];
 	g_ModsEnabled[idx2] = tmp;
 
 	obj.list = g_ModsEnabled;
 	obj.selected = idx2;
 
 	displayModList("modsEnabledList", g_ModsEnabled);
 }
 
 function areDependenciesMet(folder)
 {
 	let guiObject = Engine.GetGUIObjectByName("message");
 
 	for (let dependency of g_Mods[folder].dependencies)
 	{
 		if (isDependencyMet(dependency))
 			continue;
 
 		guiObject.caption = coloredText(
 			sprintf(translate('Dependency not met: %(dep)s'), { "dep": dependency }),
 			g_ColorDependenciesNotMet);
 
 		return false;
 	}
 
 	guiObject.caption = coloredText(translate('All dependencies met'), g_ColorDependenciesMet);
 	return true;
 }
 
 /**
  * @param dependency is a mod name or a mod version comparison.
  */
 function isDependencyMet(dependency)
 {
 	let operator = dependency.match(g_CompareVersion);
 	let [name, version] = operator ? dependency.split(operator[0]) : [dependency, undefined];
 
 	return g_ModsEnabled.some(folder =>
 		g_Mods[folder].name == name &&
 		(!operator || versionSatisfied(g_Mods[folder].version, operator[0], version)));
 }
 
 /**
  * Compares the given versions using the given operator.
  *       '-' or '_' is ignored. Only numbers are supported.
  * @note "5.3" < "5.3.0"
  */
 function versionSatisfied(version1, operator, version2)
 {
 	let versionList1 = version1.split(/[-_]/)[0].split(/\./g);
 	let versionList2 = version2.split(/[-_]/)[0].split(/\./g);
 
 	let eq = operator.indexOf("=") != -1;
 	let lt = operator.indexOf("<") != -1;
 	let gt = operator.indexOf(">") != -1;
 
 	for (let i = 0; i < Math.min(versionList1.length, versionList2.length); ++i)
 	{
 		let diff = +versionList1[i] - +versionList2[i];
 		if (isNaN(diff))
 			continue;
 
 		if (gt && diff > 0 || lt && diff < 0)
 			return true;
 
 		if (gt && diff < 0 || lt && diff > 0 || eq && diff)
 			return false;
 	}
 
 	// common prefix matches
 	let ldiff = versionList1.length - versionList2.length;
 	if (!ldiff)
 		return eq;
 
 	// NB: 2.3 != 2.3.0
 	if (ldiff < 0)
 		return lt;
 
 	return gt;
 }
 
 function sortEnabledMods()
 {
 	let dependencies = {};
 	for (let folder of g_ModsEnabled)
 		dependencies[folder] = g_Mods[folder].dependencies.map(d => d.split(g_CompareVersion)[0]);
 
 	g_ModsEnabled.sort((folder1, folder2) =>
 		dependencies[folder1].indexOf(g_Mods[folder2].name) != -1 ? 1 :
 		dependencies[folder2].indexOf(g_Mods[folder1].name) != -1 ? -1 : 0);
 
 	displayModList("modsEnabledList", g_ModsEnabled);
 }
 
 function showModDescription(listObjectName)
 {
 	let listObject = Engine.GetGUIObjectByName(listObjectName);
 
 	Engine.GetGUIObjectByName("globalModDescription").caption =
 		listObject.list[listObject.selected] ?
 			g_Mods[listObject.list[listObject.selected]].description :
 			'[color="' + g_ColorNoModSelected + '"]' + translate("No mod has been selected.") + '[/color]';
 }
+
+function visitModWebsite(listName)
+{
+	let list = Engine.GetGUIObjectByName(listName);
+	let folder = list.list_folder[list.selected];
+	let url = folder && g_Mods[folder] && g_Mods[folder].url;
+
+	if (!url)
+		return;
+
+	if (!url.startsWith("http://") && !url.startsWith("https://"))
+		url = "http://" + url;
+
+	Engine.OpenURL(url);
+}
Index: ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.xml	(revision 20598)
+++ ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.xml	(revision 20599)
@@ -1,172 +1,181 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
 
 	<script directory="gui/common/"/>
 	<script directory="gui/modmod/"/>
 
 	<object type="image" style="ModernWindow" size="0 0 100% 100%">
 
 		<!-- Page Title -->
 		<object style="ModernLabelText" type="text" size="50%-128 4 50%+128 36">
 			<translatableAttribute id="caption">Modifications</translatableAttribute>
 		</object>
 
 		<!-- Message -->
 		<object name="message" type="text" size="15 40 100%-15 88" text_align="left" textcolor="white"/>
 
 		<!-- Reset filters -->
 		<object size="15 72 184 100" type="button" style="ModernButtonRed">
 			<translatableAttribute id="caption">Reset Filters</translatableAttribute>
 			<action on="Press">resetFilters();</action>
 		</object>
 
 		<!-- Filter Panel -->
 		<object size="184 64 50% 98">
 			<object name="modGenericFilter"
 				type="input"
 				style="ModernInput"
 				size="10 100%-24 170 100%"
 			>
 				<action on="Press">applyFilters();</action>
 				<action on="TextEdit">applyFilters();</action>
 			</object>
 
 			<!-- Checkboxes -->
 			<object name="negateFilter"
 				type="checkbox"
 				checked="false"
 				style="ModernTickBox"
 				size="180 100%-24 200 100%"
 				font="serif-bold-13"
 			>
 				<action on="Press">applyFilters();</action>
 			</object>
 			<object type="text" size="202 100%-24 306 100%" text_align="left" textcolor="white">
 				<translatableAttribute id="caption">Negate</translatableAttribute>
 			</object>
 		</object>
 
 		<!-- Available Mods Wrapper -->
 		<object size="16 100 100%-15 75%-4" style="ModmodScrollbar">
 
 			<object style="ModernLabelText" type="text" size="0 5 100% 25">
 				<translatableAttribute id="caption">Available Mods</translatableAttribute>
 			</object>
 
 			<object name="modsDisabledList"
 				type="olist"
 				style="ModernSortedList"
 				sortable="true"
 				selected_column="name"
 				selected_column_order="1"
 				size="0 25 100%-2 100%"
 				font="sans-stroke-13"
 			>
 				<action on="SelectionChange">showModDescription(this.name);</action>
 				<action on="SelectionColumnChange">applyFilters();</action>
 				<action on="MouseLeftDoubleClickItem">enableMod();</action>
 
 				<!-- List headers -->
 				<column id="name" color="255 255 255" width="10%">
 					<translatableAttribute id="heading">Name</translatableAttribute>
 				</column>
 				<column id="version" color="255 255 255" width="7%">
 					<translatableAttribute id="heading">Version</translatableAttribute>
 				</column>
 				<column id="folder" color="255 255 255" width="13%">
 					<translatableAttribute id="heading">(Folder)</translatableAttribute>
 				</column>
 				<column id="label" color="255 255 255" width="26%">
 					<translatableAttribute id="heading">Mod Label</translatableAttribute>
 				</column>
 				<column id="dependencies" color="255 255 255" width="20%">
 					<translatableAttribute id="heading">Dependencies</translatableAttribute>
 				</column>
 				<column id="url" color="255 255 255" width="24%">
 					<translatableAttribute id="heading">Website</translatableAttribute>
 				</column>
 			</object>
 			<object name="globalModDescription" type="text" style="ModmodScrollbar" size="0 100%-28 100%-16 100%" textcolor="100 100 100">
 				<translatableAttribute id="caption">Description</translatableAttribute>
 			</object>
+			<object type="button" style="ModernButtonRed" size="100%-184-184-4 100%-28 100%-184-4 100%">
+				<translatableAttribute id="caption">Visit Website</translatableAttribute>
+				<action on="Press">visitModWebsite("modsDisabledList");</action>
+			</object>
 			<object type="button" style="ModernButtonRed" size="100%-184 100%-28 100% 100%">
 				<translatableAttribute id="caption">Enable</translatableAttribute>
 				<action on="Press">enableMod();</action>
 			</object>
 		</object>
 
 		<!-- Enabled Mods Wrapper -->
 		<object size="16 75% 100%-15 100%-50">
 
 			<object style="ModernLabelText" type="text" size="0 5 100% 25">
 				<translatableAttribute id="caption">Enabled Mods</translatableAttribute>
 			</object>
 
 			<object name="modsEnabledList"
 				style="ModernList"
 				type="olist"
 				size="0 25 96%-5 100%"
 				font="sans-stroke-13"
 				tooltip_style="pgToolTip"
 			>
 				<action on="SelectionChange">showModDescription(this.name);</action>
 				<action on="MouseLeftDoubleClickItem">disableMod();</action>
 
 				<!-- List headers -->
 				<column id="name" color="255 255 255" width="10%">
 					<translatableAttribute id="heading">Name</translatableAttribute>
 				</column>
 				<column id="version" color="255 255 255" width="7%">
 					<translatableAttribute id="heading">Version</translatableAttribute>
 				</column>
 				<column id="folder" color="255 255 255" width="13%">
 					<translatableAttribute id="heading">(Folder)</translatableAttribute>
 				</column>
 				<column id="label" color="255 255 255" width="26%">
 					<translatableAttribute id="heading">Mod Label</translatableAttribute>
 				</column>
 				<column id="dependencies" color="255 255 255" width="20%">
 					<translatableAttribute id="heading">Dependencies</translatableAttribute>
 				</column>
 				<column id="url" color="255 255 255" width="24%">
 					<translatableAttribute id="heading">Website</translatableAttribute>
 				</column>
 			</object>
 
 			<object type="button" style="ModernButtonRed" size="96% 23 100% 40%+12">
 				<translatableAttribute id="caption">Up</translatableAttribute>
 				<action on="Press">moveCurrItem("modsEnabledList", true);</action>
 			</object>
 			<object type="button" style="ModernButtonRed" size="96% 40%+12 100% 60%+10">
 				<translatableAttribute id="caption">X</translatableAttribute>
 				<action on="Press">disableMod();</action>
 			</object>
 			<object type="button" style="ModernButtonRed" size="96% 60%+10 100% 100%">
 				<translatableAttribute id="caption">Down</translatableAttribute>
 				<action on="Press">moveCurrItem("modsEnabledList", false);</action>
 			</object>
 		</object>
 
 		<!-- BUTTONS -->
 		<object type="button" style="ModernButtonRed" size="16 100%-44 200 100%-16">
 			<translatableAttribute id="caption">Quit</translatableAttribute>
 			<action on="Press">Engine.Exit();</action>
 		</object>
 
+		<object type="button" style="ModernButtonRed" size="100%-576-4-184 100%-44 100%-576-4 100%-16">
+			<translatableAttribute id="caption">Visit Website</translatableAttribute>
+			<action on="Press">visitModWebsite("modsEnabledList");</action>
+		</object>
+
 		<object type="button" style="ModernButtonRed" size="100%-576 100%-44 100%-392 100%-16" hotkey="cancel">
 			<translatableAttribute id="caption">Cancel</translatableAttribute>
 			<action on="Press">closePage();</action>
 		</object>
 
 		<object name="saveConfigurationButton" type="button" style="ModernButtonRed" size="100%-388 100%-44 100%-204 100%-16">
 			<translatableAttribute id="caption">Save Configuration</translatableAttribute>
 			<action on="Press">saveMods();</action>
 		</object>
 
 		<object name="startModsButton" type="button" style="ModernButtonRed" size="100%-200 100%-44 100%-16 100%-16">
 			<translatableAttribute id="caption">Start Mods</translatableAttribute>
 			<action on="Press">startMods();</action>
 		</object>
 	</object>
 </objects>