Merge branch 'image-selector' of https://github.com:Boyko-Karadzhov/Sitefinity/feather-packages

Conflicts:
	Bootstrap/client-components/fields/html-field/sf-html-field.html
	Foundation/client-components/fields/html-field/sf-html-field.html
	SemanticUI/client-components/fields/html-field/sf-html-field.html

Author: Boyko-Karadzhov

Bootstrap/client-components/fields/html-field/sf-html-field.html

@@ -1,4 +1,4 @@
-<textarea id="editor" style="height: 340px;"
+<textarea id="editor" style="height: 340px;"
     kendo-editor ng-model="sfModel"
     k-encoded="false"
     k-stylesheets='["/ResourcePackages/Bootstrap/assets/dist/css/styles.min.css"]',
@@ -11,7 +11,11 @@
         name: "createLink",
         template: "<a href=\"\" class=\"k-tool k-group-start\" ng-click=\"openLinkSelector()\" title=\"Insert hyperlink\"><span class=\"k-tool-icon k-createLink\">Create Link</span></a>"
     },
-    "unlink", "insertImage",
+    "unlink",
+    {
+        name: "insertImage",
+        template: "<a href=\"\" class=\"k-tool k-group-start\" ng-click=\"openImageSelector()\" title=\"Select image\"><span class=\"k-tool-icon k-insertImage\">Select image</span></a>"
+    },
     "createTable", "addColumnLeft", "addColumnRight", "addRowAbove", "addRowBelow", "deleteRow", "deleteColumn",
     "cleanFormatting",
     {
@@ -25,4 +29,13 @@
     ]'>
 </textarea>
 
-<sf-link-selector-modal id="linkSelectorModal"></sf-link-selector-modal>
+<sf-link-selector-modal id="linkSelectorModal"></sf-link-selector-modal>
+
+<div class="imagePropertiesModal"
+     template-url="{{imagePropertiesDialog}}"
+     modal
+     size="normal"
+     existing-scope="true"
+     window-class="sf-designer-dlg sf-timespan-selector-dlg"
+     dialog-controller="sfImagePropertiesController">
+</div>

Foundation/client-components/fields/html-field/sf-html-field.html

@@ -1,4 +1,4 @@
-<textarea id="editor" style="height: 340px;"
+<textarea id="editor" style="height: 340px;"
     kendo-editor ng-model="sfModel"
     k-encoded="false"
     k-stylesheets='["/ResourcePackages/Foundation/assets/dist/css/styles.min.css"]',
@@ -11,7 +11,11 @@
         name: "createLink",
         template: "<a href=\"\" class=\"k-tool k-group-start\" ng-click=\"openLinkSelector()\" title=\"Insert hyperlink\"><span class=\"k-tool-icon k-createLink\">Create Link</span></a>"
     },
-    "unlink", "insertImage",
+    "unlink",
+    {
+        name: "insertImage",
+        template: "<a href=\"\" class=\"k-tool k-group-start\" ng-click=\"openImageSelector()\" title=\"Select image\"><span class=\"k-tool-icon k-insertImage\">Select image</span></a>"
+    },
     "createTable", "addColumnLeft", "addColumnRight", "addRowAbove", "addRowBelow", "deleteRow", "deleteColumn",
     "cleanFormatting",
     {
@@ -25,4 +29,13 @@
     ]'>
 </textarea>
 
-<sf-link-selector-modal id="linkSelectorModal"></sf-link-selector-modal>
+<sf-link-selector-modal id="linkSelectorModal"></sf-link-selector-modal>
+
+<div class="imagePropertiesModal"
+     template-url="{{imagePropertiesDialog}}"
+     modal
+     size="normal"
+     existing-scope="true"
+     window-class="sf-designer-dlg sf-timespan-selector-dlg"
+     dialog-controller="sfImagePropertiesController">
+</div>

SemanticUI/client-components/fields/html-field/sf-html-field.html

@@ -1,4 +1,4 @@
-<textarea id="editor" style="height: 340px;"
+<textarea id="editor" style="height: 340px;"
     kendo-editor ng-model="sfModel"
     k-encoded="false"
     k-stylesheets='["/ResourcePackages/SemanticUI/assets/dist/css/styles.min.css"]',
@@ -11,7 +11,11 @@
         name: "createLink",
         template: "<a href=\"\" class=\"k-tool k-group-start\" ng-click=\"openLinkSelector()\" title=\"Insert hyperlink\"><span class=\"k-tool-icon k-createLink\">Create Link</span></a>"
     },
-    "unlink", "insertImage",
+    "unlink",
+    {
+        name: "insertImage",
+        template: "<a href=\"\" class=\"k-tool k-group-start\" ng-click=\"openImageSelector()\" title=\"Select image\"><span class=\"k-tool-icon k-insertImage\">Select image</span></a>"
+    },
     "createTable", "addColumnLeft", "addColumnRight", "addRowAbove", "addRowBelow", "deleteRow", "deleteColumn",
     "cleanFormatting",
     {
@@ -25,4 +29,13 @@
     ]'>
 </textarea>
 
-<sf-link-selector-modal id="linkSelectorModal"></sf-link-selector-modal>
+<sf-link-selector-modal id="linkSelectorModal"></sf-link-selector-modal>
+
+<div class="imagePropertiesModal"
+     template-url="{{imagePropertiesDialog}}"
+     modal
+     size="normal"
+     existing-scope="true"
+     window-class="sf-designer-dlg sf-timespan-selector-dlg"
+     dialog-controller="sfImagePropertiesController">
+</div>