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

Creates umb-content-name to share amongst editors so we have less html duplication.

Browse Source
This commit is contained in:
Shannon
2013-07-16 12:58:57 +10:00
parent c4d2c7d31a
commit c7b4cfd375
4 changed files with 66 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Umbraco.Web.UI.Client/src/common/directives/umbcontentname.directive.js Normal file
View File

@@ -0,0 +1,22 @@
/**
* @ngdoc object
* @name umbraco.directive:umbContentName
* @restrict E
* @description
* Used by editors that require naming an entity. Shows a textbox/headline with a required validator within it's own form.
**/
angular.module("umbraco.directives")
.directive('umbContentName', function () {
return {
require: "ngModel",
restrict: 'E',
replace: true,
templateUrl: 'views/directives/umb-content-name.html',
scope: {
placeholder: '@placeholder',
model: '=ngModel'
},
link: function(scope, element, attrs, modelCtrl) {
}
};
});

41
src/Umbraco.Web.UI.Client/src/views/content/edit.html
View File

@@ -2,33 +2,30 @@
<umb-panel ng-controller="Umbraco.Editors.ContentEditController" val-show-validation>
<umb-header tabs="content.tabs">
<div class="span4 control-group" ng-class="{error: contentForm.name.$invalid}">
<input name="name" type="text" placeholder="Enter a page title" headline ng-model="content.name" required="Name is required" />
<span class="help-inline" val-msg-for="name" val-toggle-msg="required">Required</span>
</div>
<umb-content-name ng-model="content.name" placeholder="Enter a page title"></umb-content-name>
<div class="span8">
<div class="btn-toolbar pull-right umb-btn-toolbar">
<div class="btn-group">
<a class="btn" ng-click="preview(content)"
data-shortcut="ctrl+s">Preview page</a>
</div>
<div class="span8">
<div class="btn-toolbar pull-right umb-btn-toolbar">
<div class="btn-group">
<a class="btn" ng-click="preview(content)"
data-shortcut="ctrl+s">Preview page</a>
</div>
<div class="btn-group">
<a class="btn btn-success" href="#" ng-click="saveAndPublish(content)"
prevent-default data-shortcut="ctrl+p">Publish</a>
<div class="btn-group">
<a class="btn btn-success" href="#" ng-click="saveAndPublish(content)"
prevent-default data-shortcut="ctrl+p">Publish</a>
<a class="btn btn-success dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</a>
<a class="btn btn-success dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
<li><a href="#" ng-click="save(content)"
prevent-default data-shortcut="ctrl+s">Save draft</a></li>
</ul>
</div>
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
<li><a href="#" ng-click="save(content)"
prevent-default data-shortcut="ctrl+s">Save draft</a></li>
</ul>
</div>
</div>
</div>
</umb-header>
<umb-tab-view>
@@ -43,4 +40,4 @@
</umb-tab>
</umb-tab-view>
</umb-panel>
</ng-form>
</ng-form>

6
src/Umbraco.Web.UI.Client/src/views/directives/umb-content-name.html Normal file
View File

@@ -0,0 +1,6 @@
<ng-form name="contentNameForm">
<div class="span4 control-group" ng-class="{error: contentNameForm.name.$invalid}">
<input name="name" type="text" placeholder="{{placeholder}}" headline ng-model="model" required />
<span class="help-inline" val-msg-for="name" val-toggle-msg="required">Required</span>
</div>
</ng-form>

39
src/Umbraco.Web.UI.Client/src/views/media/edit.html
View File

@@ -1,32 +1,31 @@
<ng-form name="contentForm" ng-show="contentLoaded">
<umb-panel ng-controller="Umbraco.Editors.MediaEditController" val-show-validation>
<umb-header tabs="content.tabs">
<div class="span4">
<input type="text" placeholder="Enter a page title" headline ng-model="content.name" />
</div>
<umb-content-name ng-model="content.name" placeholder="Enter a page title"></umb-content-name>
<div class="span8">
<div class="btn-toolbar pull-right umb-btn-toolbar">
<div class="btn-group">
<a class="btn" ng-click="preview(content)"
data-shortcut="ctrl+s">Preview page</a>
</div>
<div class="span8">
<div class="btn-toolbar pull-right umb-btn-toolbar">
<div class="btn-group">
<a class="btn" ng-click="preview(content)"
data-shortcut="ctrl+s">Preview page</a>
</div>
<div class="btn-group">
<a class="btn btn-success" href="#" ng-click="saveAndPublish(content)"
prevent-default>Publish</a>
<div class="btn-group">
<a class="btn btn-success" href="#" ng-click="saveAndPublish(content)"
prevent-default>Publish</a>
<a class="btn btn-success dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</a>
<a class="btn btn-success dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
<li><a href="#" ng-click="save(content)"
prevent-default data-shortcut="ctrl+s">Save draft</a></li>
</ul>
</div>
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
<li><a href="#" ng-click="save(content)"
prevent-default data-shortcut="ctrl+s">Save draft</a></li>
</ul>
</div>
</div>
</div>
</umb-header>
<umb-tab-view>