Added new property URL to both PluginDescriptor and ThemeManifest

muratcakir · muratcakir · commit 4a16eacee117 · 2015-02-25T23:46:37.000+01:00
diff --git a/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs b/src/Libraries/SmartStore.Core/Packaging/PackagingUtils.cs
@@ -81,7 +81,7 @@ internal static ExtensionDescriptor ConvertToExtensionDescriptor(this PluginDesc
 				Version = pluginDescriptor.Version,
 				Name = pluginDescriptor.FriendlyName,
 				Description = pluginDescriptor.Description,
-				WebSite = string.Empty, // TODO: (pkg) Add author url to plugin manifests,
+				WebSite = pluginDescriptor.Url, // TODO: (pkg) Add author url to plugin manifests,
 				Tags = string.Empty // TODO: (pkg) Add tags to plugin manifests,
 			};
 
@@ -101,7 +101,7 @@ internal static ExtensionDescriptor ConvertToExtensionDescriptor(this ThemeManif
 				Version = new Version(themeManifest.Version),
 				Name = themeManifest.ThemeTitle,
 				Description = string.Empty, // TODO: (pkg) Add description to theme manifests
-				WebSite = string.Empty, // TODO: (pkg) Add author url to theme manifests,
+				WebSite = themeManifest.Url,
 				Tags = string.Empty // TODO: (pkg) Add tags to theme manifests,
 			};
 
diff --git a/src/Libraries/SmartStore.Core/Plugins/PluginDescriptor.cs b/src/Libraries/SmartStore.Core/Plugins/PluginDescriptor.cs
@@ -143,6 +143,12 @@ public bool IsInKnownGroup
 		[DataMember]
 		public string Author { get; set; }
 
+		/// <summary>
+		/// Gets or sets the project/marketplace url
+		/// </summary>
+		[DataMember]
+		public string Url { get; set; }
+
         /// <summary>
         /// Gets or sets the display order
         /// </summary>
diff --git a/src/Libraries/SmartStore.Core/Plugins/PluginFileParser.cs b/src/Libraries/SmartStore.Core/Plugins/PluginFileParser.cs
@@ -161,6 +161,9 @@ public static PluginDescriptor ParsePluginDescriptionFile(string filePath)
                     case "Author":
                         descriptor.Author = value;
                         break;
+					case "Url":
+						descriptor.Url = value;
+						break;
                     case "DisplayOrder":
                         {
                             int displayOrder;
@@ -219,6 +222,7 @@ public static void SavePluginDescriptionFile(PluginDescriptor plugin)
             keyValues.Add(new KeyValuePair<string, string>("Version", plugin.Version.ToString()));
             keyValues.Add(new KeyValuePair<string, string>("MinAppVersion", string.Join(",", plugin.MinAppVersion)));
             keyValues.Add(new KeyValuePair<string, string>("Author", plugin.Author));
+			keyValues.Add(new KeyValuePair<string, string>("Url", plugin.Url));
             keyValues.Add(new KeyValuePair<string, string>("DisplayOrder", plugin.DisplayOrder.ToString()));
             keyValues.Add(new KeyValuePair<string, string>("FileName", plugin.PluginFileName));
 			keyValues.Add(new KeyValuePair<string, string>("ResourceRootKey", plugin.ResourceRootKey));
diff --git a/src/Libraries/SmartStore.Core/Themes/ThemeManifest.cs b/src/Libraries/SmartStore.Core/Themes/ThemeManifest.cs
@@ -163,6 +163,12 @@ public string Author
 			protected internal set; 
 		}
 
+		public string Url
+		{
+			get;
+			protected internal set;
+		}
+
         public string Version 
 		{ 
 			get; 
diff --git a/src/Libraries/SmartStore.Core/Themes/ThemeManifestMaterializer.cs b/src/Libraries/SmartStore.Core/Themes/ThemeManifestMaterializer.cs
@@ -35,6 +35,7 @@ public ThemeManifest Materialize()
             _manifest.PreviewImageUrl = root.GetAttribute("previewImageUrl").NullEmpty() ?? "~/Themes/{0}/preview.png".FormatCurrent(_manifest.ThemeName);
             _manifest.PreviewText = root.GetAttribute("previewText").ToSafe();
             _manifest.Author = root.GetAttribute("author").ToSafe();
+			_manifest.Url = root.GetAttribute("url").ToSafe();
             _manifest.Version = root.GetAttribute("version").ToSafe().HasValue() ? root.GetAttribute("version") : "1.0";
 
             _manifest.Selects = MaterializeSelects();
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ThemeController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ThemeController.cs
@@ -125,6 +125,7 @@ protected virtual ThemeManifestModel PrepareThemeManifestModel(ThemeManifest man
                     Title = manifest.ThemeTitle,
                     Description = manifest.PreviewText,
                     Author = manifest.Author,
+					Url = manifest.Url,
                     Version = manifest.Version,
                     IsMobileTheme = manifest.MobileTheme,
                     SupportsRtl = manifest.SupportRtl,
diff --git a/src/Presentation/SmartStore.Web/Administration/Models/Themes/ThemeManifestModel.cs b/src/Presentation/SmartStore.Web/Administration/Models/Themes/ThemeManifestModel.cs
@@ -20,6 +20,8 @@ public class ThemeManifestModel : ITopologicSortable<string>
 
         public string Author { get; set; }
 
+		public string Url { get; set; }
+
         public string Version { get; set; }
 
         public string PreviewImageUrl { get; set; }

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,12 @@ public string Author`
`163`	`163`	`protected internal set;`
`164`	`164`	`}`
`165`	`165`
	`166`	`+ public string Url`
	`167`	`+ {`
	`168`	`+ get;`
	`169`	`+ protected internal set;`
	`170`	`+ }`
	`171`	`+`
`166`	`172`	`public string Version`
`167`	`173`	`{`
`168`	`174`	`get;`