Minor licensing changes

mgesing · mgesing · commit 27b41e4d7d27 · 2015-03-16T21:54:05.000+01:00
diff --git a/src/Presentation/SmartStore.Web/Administration/Views/Plugin/List.cshtml b/src/Presentation/SmartStore.Web/Administration/Views/Plugin/List.cshtml
@@ -100,10 +100,10 @@
 								}
 								@if (plugin.LicenseUrl.HasValue())
 								{
-									<a class="btn btn-small plugin-licence" href="javascript:void(0)" data-url="@plugin.LicenseUrl">
+									<button class="btn btn-small plugin-licence" type="button" data-url="@plugin.LicenseUrl">
 										<i class="fa fa-key"></i>
 										@T("Admin.Common.License")
-									</a>
+									</button>
 								}
 							</div>
 						</div>	
@@ -432,7 +432,7 @@
         });
 
     	// licence plugin
-    	$(document).on('click', 'a.plugin-licence', function (e) {
+    	$(document).on('click', 'button.plugin-licence', function (e) {
     		var dialog = $('#plugin-licence-modal'),
 				url = $(this).attr('data-url');
 
diff --git a/src/Presentation/SmartStore.Web/Views/Shared/LicenseRequired.cshtml b/src/Presentation/SmartStore.Web/Views/Shared/LicenseRequired.cshtml
@@ -8,24 +8,22 @@
 		Html.AddTitleParts(T("Admin.Plugins.AddOnLicensing").Text);
 	}
 }
-<div class="page">
-	<div class="page-title">
-		<h2>@T("Admin.Plugins.AddOnLicensing")</h2>
-	</div>
-
-	<div class="clear"></div>
-
-	<div class="page-body">
-		<div class="alert alert-error fade in">
-			<p>
-				<strong>Systemname:</strong> @Model["SystemName"]
-				<br />
-				<strong>Controller:</strong> @Model["ControllerName"],
-				<strong>Action:</strong> @Model["ActionName"]
-			</p>
-			<p>
-				<span>@Html.Raw(Model["Message"])</span>
-			</p>
+@if (Model["Message"] != null && ((string)Model["Message"]).HasValue())
+{
+	<div class="page">
+		<div class="page-body">
+			<div class="alert alert-error fade in">
+				<h4>@T("Admin.Plugins.AddOnLicensing")</h4>
+				<p>
+					<strong>Systemname:</strong> @Model["SystemName"]
+					<br />
+					<strong>Controller:</strong> @Model["ControllerName"],
+					<strong>Action:</strong> @Model["ActionName"]
+				</p>
+				<p>
+					<span>@Html.Raw(Model["Message"])</span>
+				</p>
+			</div>
 		</div>
 	</div>
-</div>
+}

Original file line number	Diff line number	Diff line change
`@@ -100,10 +100,10 @@`
`100`	`100`	`}`
`101`	`101`	`@if (plugin.LicenseUrl.HasValue())`
`102`	`102`	`{`
`103`		`- <a class="btn btn-small plugin-licence" href="javascript:void(0)" data-url="@plugin.LicenseUrl">`
	`103`	`+ <button class="btn btn-small plugin-licence" type="button" data-url="@plugin.LicenseUrl">`
`104`	`104`	`<i class="fa fa-key"></i>`
`105`	`105`	`@T("Admin.Common.License")`
`106`		`- </a>`
	`106`	`+ </button>`
`107`	`107`	`}`
`108`	`108`	`</div>`
`109`	`109`	`</div>`
`@@ -432,7 +432,7 @@`
`432`	`432`	`});`
`433`	`433`
`434`	`434`	`// licence plugin`
`435`		`- $(document).on('click', 'a.plugin-licence', function (e) {`
	`435`	`+ $(document).on('click', 'button.plugin-licence', function (e) {`
`436`	`436`	`var dialog = $('#plugin-licence-modal'),`
`437`	`437`	`url = $(this).attr('data-url');`
`438`	`438`