Umbraco 7.15.3

2019-11-23 21:51:02 -05:00
parent 7e9bd9ee5b
commit 866cfa29d7
219 changed files with 66394 additions and 66487 deletions
@@ -9,6 +9,7 @@
                search-from-id="{{searchInfo.searchFromId}}"
                search-from-name="{{searchInfo.searchFromName}}"
                show-search="{{searchInfo.showSearch}}"
+                datatype-id="{{searchInfo.dataTypeId}}"
                section="content">
            </umb-tree-search-box>
        </div>
@@ -45,4 +46,4 @@
        on-close="closeMiniListView()">
    </umb-mini-list-view>

-</div>
+</div>
@@ -32,27 +32,32 @@
            <li class="umb-checkbox-list__item" ng-repeat="contentTypeEntity in model.whereCompositionUsed"><a ng-click="vm.openContentType(contentTypeEntity.contentType, model.section)"><i class="{{contentTypeEntity.contentType.icon}}"></i>&nbsp;{{contentTypeEntity.contentType.name}}</a></li>
        </ul>
    </div>
-    <ul class="umb-checkbox-list">
-        <li class="umb-checkbox-list__item"
-            ng-repeat="compositeContentType in model.availableCompositeContentTypes | filter:searchTerm"
-            ng-class="{'-disabled': compositeContentType.allowed===false || compositeContentType.inherited, '-selected': vm.isSelected(compositeContentType.contentType.alias)}">
+    <div ng-if="vm.availableGroups.length > 0">
+        <ul class="umb-checkbox-list" ng-repeat="group in vm.availableGroups | filter:searchTerm">
+            <li style="font-weight: bold" ng-show="vm.availableGroups.length > 1">
+                <i class="icon-folder umb-checkbox-list__item-icon"></i>
+                {{group.containerPath}}
+            </li>
+            <li class="umb-checkbox-list__item"
+                ng-repeat="compositeContentType in group.compositeContentTypes | orderBy:'contentType.name' | filter:searchTerm"
+                ng-class="{'-disabled': compositeContentType.allowed===false || compositeContentType.inherited, '-selected': vm.isSelected(compositeContentType.contentType.alias)}">

-            <div class="umb-checkbox-list__item-checkbox"
-                 ng-class="{ '-selected': model.compositeContentTypes.indexOf(compositeContentType.contentType.alias)+1 }">
-                <input type="checkbox"
-                       id="umb-overlay-comp-{{compositeContentType.contentType.key}}"
-                       checklist-model="model.compositeContentTypes"
-                       checklist-value="compositeContentType.contentType.alias"
-                       ng-change="model.selectCompositeContentType(compositeContentType.contentType)"
-                       ng-disabled="compositeContentType.allowed===false || compositeContentType.inherited" />
-            </div>
+                <div class="umb-checkbox-list__item-checkbox"
+                     ng-class="{ '-selected': model.compositeContentTypes.indexOf(compositeContentType.contentType.alias)+1 }">
+                    <input type="checkbox"
+                           id="umb-overlay-comp-{{compositeContentType.contentType.key}}"
+                           checklist-model="model.compositeContentTypes"
+                           checklist-value="compositeContentType.contentType.alias"
+                           ng-change="model.selectCompositeContentType(compositeContentType.contentType)"
+                           ng-disabled="compositeContentType.allowed===false || compositeContentType.inherited" />
+                </div>

-            <label for="umb-overlay-comp-{{compositeContentType.contentType.key}}" class="umb-checkbox-list__item-text" ng-class="{'-faded': compositeContentType.allowed===false}">
-                <i class="{{ compositeContentType.contentType.icon }} umb-checkbox-list__item-icon"></i>
-                {{ compositeContentType.contentType.name }}
-                <span class="umb-checkbox-list__item-caption" ng-if="compositeContentType.inherited">(inherited)</span>
-            </label>
-
-        </li>
-    </ul>
+                <label for="umb-overlay-comp-{{compositeContentType.contentType.key}}" class="umb-checkbox-list__item-text" ng-class="{'-faded': compositeContentType.allowed===false}">
+                    <i class="{{ compositeContentType.contentType.icon }} umb-checkbox-list__item-icon"></i>
+                    {{ compositeContentType.contentType.name }}
+                    <span class="umb-checkbox-list__item-caption" ng-if="compositeContentType.inherited">(inherited)</span>
+                </label>
+            </li>
+        </ul>
+    </div>
 </div>
@@ -1,5 +1,3 @@
-
-
 <div ng-controller="Umbraco.Overlays.IconPickerOverlay">

    <div class="umb-control-group">
@@ -17,7 +15,11 @@
    </div>

    <div class="umb-control-group">
-        <umb-color-swatches colors="colors" selected-color="color" size="s"></umb-color-swatches>
+        <umb-color-swatches colors="colors"
+                            selected-color="color"
+                            size="s"
+                            use-color-class="true">
+        </umb-color-swatches>
    </div>

    <umb-load-indicator ng-if="loading"></umb-load-indicator>
@@ -12,7 +12,7 @@
    </div>

    <ul class="umb-card-grid">
-        <li ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:'name' | filter:searchTerm"
+        <li ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:model.orderBy | filter:searchTerm"
            ng-click="selectItem(availableItem)"
            class="-three-in-row">
            <a class="umb-card-grid-item" href="" title="{{ availableItem.name }}">
@@ -43,12 +43,12 @@
        <h5>
            <localize key="defaultdialogs_linkToPage">Link to page</localize>
        </h5>
-
        <div ng-hide="miniListView">
            <umb-tree-search-box hide-search-callback="hideSearch"
                                 search-callback="onSearchResults"
                                 search-from-id="{{searchInfo.searchFromId}}"
                                 search-from-name="{{searchInfo.searchFromName}}"
+                                 datatype-id="{{searchInfo.dataTypeId}}"
                                 show-search="{{searchInfo.showSearch}}"
                                 section="{{section}}">
            </umb-tree-search-box>
@@ -64,6 +64,7 @@
                <umb-tree section="content"
                          hideheader="true"
                          hideoptions="true"
+						  customtreeparams="{{customTreeParams}}"
                          eventhandler="dialogTreeEventHandler"
                          enablelistviewexpand="true"
                          isdialog="true"
@@ -11,7 +11,6 @@

            <umb-load-indicator ng-if="loading">
            </umb-load-indicator>
-
            <div class="form-search">
                <i class="icon-search"></i>
                <input class="umb-search-field search-query -full-width-input"
@@ -21,6 +20,13 @@
                       ng-change="changeSearch()"
                       type="text"
                       no-dirty-check />
+
+                <div class="form-search__toggle">
+                    <input type="checkbox" ng-model="showChilds" ng-change="toggle()" />
+                    <label>
+                        <localize key="general_includeFromsubFolders">Include subfolders in search</localize>
+                    </label>
+                </div>
            </div>

            <div class="upload-button">
@@ -83,7 +89,9 @@
                        item-max-height="150"
                        item-min-width="100"
                        item-min-height="100"
-                        only-images={{onlyImages}}>
+                        only-images={{onlyImages}}
+                        include-sub-folders={{showChilds}}
+                        current-Folder-id="{{currentFolder.id}}">
        </umb-media-grid>

        <div class="flex justify-center">
@@ -10,6 +10,7 @@
                search-from-id="{{searchInfo.searchFromId}}"
                search-from-name="{{searchInfo.searchFromName}}"
                show-search="{{searchInfo.showSearch}}"
+                datatype-id="{{searchInfo.dataTypeId}}"
                section="{{section}}">
            </umb-tree-search-box>
        </div>
@@ -19,7 +20,7 @@
            results="searchInfo.results"
            select-result-callback="selectResult">
        </umb-tree-search-results>
-      
+
      <umb-empty-state ng-if="!hasItems && emptyStateMessage" position="center">
        {{ emptyStateMessage }}
      </umb-empty-state>
@@ -48,7 +49,8 @@
        entity-type="{{entityType}}"
        start-node-id="model.startNodeId"
        on-select="selectListViewNode(node)"
-        on-close="closeMiniListView()">
+        on-close="closeMiniListView()"
+        entity-type-filter="filter">
    </umb-mini-list-view>

-</div>
+</div>
@@ -1,5 +1,4 @@
 <div ng-controller="Umbraco.Overlays.UserController">
-
    <div class="umb-control-group" ng-if="!showPasswordFields">

       <h5><localize key="user_yourProfile" /></h5>
@@ -78,7 +77,7 @@
    </div>


-    <div class="umb-control-group" ng-if="!showPasswordFields">
+    <div class="umb-control-group" ng-if="!showPasswordFields && history.length">
        <h5><localize key="user_yourHistory" /></h5>
        <ul class="umb-tree">
            <li ng-repeat="item in history | orderBy:'time':true">
@@ -126,7 +125,7 @@

    </div>

-    <div class="umb-control-group">
+    <div class="umb-control-group" ng-if="tab.length">
        <div ng-repeat="tab in dashboard">
            <div ng-repeat="property in tab.properties">
                <div>