added website field

3 files changed, 25 insertions, 18 deletions

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 3f5d59e56e2..8a96885b789 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -129,7 +129,6 @@ span.version { margin-left:1em; margin-right:1em; color:#555; }
 .app:hover, .app:active { max-width: inherit; }
 
 .appslink { text-decoration: underline; }
-.doclink { text-decoration: underline; }
 .score { color:#666; font-weight:bold; font-size:0.8em; }
 
 .appinfo .documentation {
diff --git a/settings/js/apps.js b/settings/js/apps.js
index ce81dff4485..2c6f77d9314 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -39,21 +39,27 @@ OC.Settings.Apps = OC.Settings.Apps || {
 
 		var userDocumentation = false;
 		var adminDocumentation = false;
-		if (typeof(app.documentation.user) !== 'undefined') {
-			userDocumentation = true;
-			page.find('span.userDocumentation').html("<a href='" + app.documentation.user + "'>" + t('settings', 'User Documentation') + "</a>");
-			page.find('p.documentation').show();
-		}
-		if (typeof(app.documentation.admin) !== 'undefined') {
-			adminDocumentation = true;
-			page.find('span.adminDocumentation').html("<a href='" + app.documentation.admin + "'>" + t('settings', 'Admin Documentation') + "</a>");
-			page.find('p.documentation').show();
-		}
+		if (typeof(app.documentation) !== 'undefined') {
+			if (typeof(app.documentation.user) !== 'undefined') {
+				userDocumentation = true;
+				page.find('span.userDocumentation').html("<a id='userDocumentation' href='" + app.documentation.user + "'>" + t('settings', 'User Documentation') + "</a>");
+				page.find('p.documentation').show();
+			}
+			if (typeof(app.documentation.admin) !== 'undefined') {
+				adminDocumentation = true;
+				page.find('span.adminDocumentation').html("<a id='adminDocumentation' href='" + app.documentation.admin + "'>" + t('settings', 'Admin Documentation') + "</a>");
+				page.find('p.documentation').show();
+			}
 
-		if(userDocumentation && adminDocumentation) {
-			page.find('span.userDocumentation').after(', ');
+			if(userDocumentation && adminDocumentation) {
+				page.find('span.userDocumentation').after(', ');
+			}
 		}
 
+		if (typeof(app.website) !== 'undefined') {
+			page.find('p.website').show();
+			page.find('a#websitelink').attr('href', app.website);
+		}
 
 		if (app.update !== false) {
 			page.find('input.update').show();
@@ -69,8 +75,8 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		page.find('input.enable').data('active', app.active);
 		if (app.internal === false) {
 			page.find('span.score').show();
-			page.find('p.appslink').show();
-			page.find('a.appslink').attr('href', 'http://apps.owncloud.com/content/show.php?content=' + app.id);
+			page.find('p.appstore').show();
+			page.find('a#appstorelink').attr('href', 'http://apps.owncloud.com/content/show.php?content=' + app.id);
 			page.find('small.externalapp').hide();
 		} else {
 			page.find('p.appslink').hide();
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index be1cf0387b8..e04815f9b99 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -36,12 +36,14 @@
 	<p class="description"></p>
 	<p class="documentation hidden">
 		<?php p($l->t("Documentation:"));?>
-		<span class="userDocumentation doclink"></span>
-		<span class="adminDocumentation doclink"></span>
+		<span class="userDocumentation appslink"></span>
+		<span class="adminDocumentation appslink"></span>
 	</p>
 	<img src="" class="preview hidden" />
-	<p class="appslink hidden"><a href="#" target="_blank"><?php
+	<p class="appslink appstore hidden"><a id="appstorelink" href="#" target="_blank"><?php
 		p($l->t('See application page at apps.owncloud.com'));?></a></p>
+	<p class="appslink website hidden"><a id="websitelink" href="#" target="_blank"><?php
+		p($l->t('See application website'));?></a></p>
 	<p class="license hidden"><?php
 		print_unescaped($l->t('<span class="licence"></span>-licensed by <span class="author"></span>'));?></p>
 	<input class="enable hidden" type="submit" />