yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed more styling and validation bits for insert macro dialog.

Browse Source
This commit is contained in:
Shannon
2013-09-24 16:01:00 +10:00
parent 1ce9554e66
commit dbf9f70369
4 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web.UI.Client/src/common/directives/validation/valshowvalidation.directive.js
View File

@@ -11,19 +11,23 @@ function valShowValidation(serverValidationManager) {
restrict: "A",
link: function (scope, element, attr, ctrl) {
var className = attr.valShowValidation ? attr.valShowValidation : "show-validation";
var savingEventName = attr.savingEvent ? attr.savingEvent : "saving";
var savedEvent = attr.savedEvent ? attr.savingEvent : "saved";
//we should show validation if there are any msgs in the server validation collection
if (serverValidationManager.items.length > 0) {
element.addClass("show-validation");
element.addClass(className);
}
//listen for the forms saving event
scope.$on("saving", function (ev, args) {
element.addClass("show-validation");
scope.$on(savingEventName, function (ev, args) {
element.addClass(className);
});
//listen for the forms saved event
scope.$on("saved", function (ev, args) {
element.removeClass("show-validation");
scope.$on(savedEvent, function (ev, args) {
element.removeClass(className);
});
}

3
src/Umbraco.Web.UI.Client/src/less/property-editors.less
View File

@@ -4,6 +4,9 @@
.tab-content .control-group .umb-editor {
width:66.6%;
}
.umb-modal .control-group .umb-editor {
width: 80%;
}
//

2
src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.controller.js
View File

@@ -61,7 +61,7 @@ function InsertMacroController($scope, entityResource, macroResource, umbPropEdi
$scope.macroParams = [];
$scope.submitForm = function () {
if ($scope.wizardStep === "paramSelect") {
//we need to broadcast the saving event for the toggle validators to work
$scope.$broadcast("saving");

26
src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.html
View File

@@ -1,41 +1,41 @@
<div class="umb-panel show-validation" ng-controller="Umbraco.Dialogs.InsertMacroController">
<form novalidate name="insertMacroForm" ng-submit="submitForm()" ng-controller="Umbraco.Dialogs.InsertMacroController">
<div class="umb-panel" val-show-validation>
<form novalidate name="insertMacroForm" ng-submit="submitForm()">
<div class="umb-panel-header">
<div class="umb-el-wrap umb-panel-buttons">
<div class="btn-toolbar umb-btn-toolbar">
<button type="button" class="btn" ng-click="close()">Cancel</button>
<button type="submit" class="btn btn-primary">Ok</button>
</div>
</div>
</div>
<div class="umb-panel-body umb-scrollable" auto-scale="1">
<div class="tab-content umb-control-group" ng-switch="wizardStep">
<div class="umb-control-group" ng-switch="wizardStep">
<div class="umb-pane" ng-switch-when="macroSelect">
<label for="macroName">Choose a macro</label>
<select name="selectedMacro" ng-model="$parent.selectedMacro" ng-options="m.id as m.name for m in macros" required>
<option value="">-- Choose macro --</option>
</select>
</select>
</div>
<div class="umb-pane" ng-switch-when="paramSelect">
<ul class="unstyled">
<li ng-repeat="param in $parent.macroParams">
<div class="control-group umb-control-group" ng-class="{error: insertMacroForm.$invalid}" >
<div class="control-group umb-control-group" ng-class="{error: insertMacroForm.$invalid}">
<label>{{param.name}}</label>
<umb-editor model="param"></umb-editor>
<umb-editor model="param"></umb-editor>
</div>
</li>
</ul>
</div>
</div>
</div>
</form>
</div>
</div>
</form>