merge conflicts

1 files changed, 62 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/SitesModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/SitesModule.cs
new file mode 100644
index 000000000..96d3aed49
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/SitesModule.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media.Imaging;
+using Tango.BL.Enumerations;
+using Tango.MachineStudio.Common;
+using Tango.MachineStudio.Sites.Views;
+using Tango.SharedUI.Helpers;
+
+namespace Tango.MachineStudio.Sites
+{
+    [StudioModule(20)]
+    public class SitesModule : StudioModuleBase
+    {
+        public override string Name
+        {
+            get
+            {
+                return "Sites";
+            }
+        }
+
+        public override string Description
+        {
+            get
+            {
+                return "Manage organizations sites and their common machine properties.";
+            }
+        }
+
+        public override BitmapSource Image
+        {
+            get
+            {
+                return ResourceHelper.GetImageFromResources("Images/site.png");
+            }
+        }
+
+        public override Type MainViewType
+        {
+            get
+            {
+                return typeof(MainView);
+            }
+        }
+
+        public override Permissions Permission
+        {
+            get
+            {
+                return Permissions.RunRMLModule;
+            }
+        }
+
+        public override void Dispose()
+        {
+
+        }
+    }
+}