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

changes options to actions

Browse Source
This commit is contained in:
perploug
2013-11-12 19:01:24 +01:00
parent 8465b3465b
commit c4a0e1e923
6 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
View File

@@ -6,7 +6,7 @@
* @description
* The controller for the content editor
*/
function ContentEditController($scope, $routeParams, $q, $timeout, $window, contentResource, navigationService, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, treeService, fileManager, formHelper, umbRequestHelper) {
function ContentEditController($scope, $routeParams, $q, $timeout, $window, contentResource, navigationService, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, treeService, fileManager, formHelper, umbRequestHelper, keyboardService) {
$scope.defaultButton = null;
$scope.subButtons = [];
@@ -63,6 +63,8 @@ function ContentEditController($scope, $routeParams, $q, $timeout, $window, cont
switch (ch) {
case "U":
//publish action
keyboardService.bind("ctrl+p", $scope.saveAndPublish);
return {
letter: ch,
labelKey: "buttons_saveAndPublish",
@@ -71,14 +73,17 @@ function ContentEditController($scope, $routeParams, $q, $timeout, $window, cont
};
case "H":
//send to publish
keyboardService.bind("ctrl+p", $scope.sendToPublish);
return {
letter: ch,
labelKey: "buttons_saveToPublish",
handler: $scope.sendToPublish,
hotKey: "ctrl+t"
hotKey: "ctrl+p"
};
case "A":
//save
keyboardService.bind("ctrl+s", $scope.save);
return {
letter: ch,
labelKey: "buttons_save",
@@ -87,6 +92,8 @@ function ContentEditController($scope, $routeParams, $q, $timeout, $window, cont
};
case "Z":
//unpublish
keyboardService.bind("ctrl+u", $scope.unPublish);
return {
letter: ch,
labelKey: "content_unPublish",

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

@@ -3,6 +3,7 @@
ng-show="loaded"
ng-submit="save()"
val-form-manager>
<umb-panel>
<umb-header tabs="content.tabs">
@@ -15,8 +16,7 @@
ng-model="content.name" />
</div>
<div class="span5">
<div class="span5">
<div class="btn-toolbar pull-right umb-btn-toolbar">
<div class="btn-group" ng-animate="'fade'" ng-show="formStatus">
<p class="btn btn-link umb-status-label">{{formStatus}}</p>
@@ -25,7 +25,7 @@
<div class="btn-group" ng-class="{dimmed: content.id === 0}">
<!-- options button -->
<a class="btn" href="#" ng-click="options(content)" prevent-default data-toggle="dropdown">
Options <span class="caret"></span>
<localize key="general_actions">Actions</localize> <span class="caret"></span>
</a>
<!-- actions -->
@@ -64,7 +64,7 @@
<div class="btn-group dropup" ng-if="defaultButton">
<!-- primary button -->
<a class="btn btn-success" href="#" ng-click="performAction(defaultButton)" prevent-default data-hotkey="{{defaultButton.hotKey}}">
<a class="btn btn-success" href="#" ng-click="performAction(defaultButton)" prevent-default>
<localize key="{{defaultButton.labelKey}}">{{defaultButton.labelKey}}</localize>
</a>
@@ -75,16 +75,15 @@
<!-- sub buttons -->
<ul class="dropdown-menu bottom-up" role="menu" aria-labelledby="dLabel" ng-if="subButtons.length > 0">
<li ng-repeat="btn in subButtons">
<a href="#" ng-click="performAction(btn)" prevent-default data-hotkey="{{btn.hotKey}}">
<a href="#" ng-click="performAction(btn)" prevent-default>
<localize key="{{btn.labelKey}}">{{btn.labelKey}}</localize>
</a>
</li>
</ul>
</div>
</div>
</div>
</umb-tab>
</umb-tab-view>
</umb-panel>
</form>
</form>

11
src/Umbraco.Web.UI.Client/src/views/datatype/edit.html
View File

@@ -9,10 +9,10 @@
<div class="span4">
<input type="text"
class="umb-headline"
localize="placeholder"
placeholder="@placeholders_entername"
ng-model="content.name" />
class="umb-headline"
localize="placeholder"
placeholder="@placeholders_entername"
ng-model="content.name" />
</div>
<div class="span8">
@@ -20,7 +20,8 @@
<div class="btn-group" ng-class="{dimmed: content.id === 0}">
<!-- options button -->
<a class="btn" href="#" ng-click="options(content)" prevent-default data-toggle="dropdown">
<i class="icon-settings" style="line-height: 14px"></i> Options
<i class="icon-settings" style="line-height: 14px"></i>
<localize key="general_actions">Actions</localize>
</a>
<a class="btn dropdown-toggle" ng-click="options(content)" data-toggle="dropdown">

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

@@ -23,7 +23,8 @@
<div class="btn-group" ng-class="{dimmed: content.id === 0}">
<!-- options button -->
<a class="btn" href="#" ng-click="options(content)" prevent-default data-toggle="dropdown">
<i class="icon-settings" style="line-height: 14px"></i> Options
<i class="icon-settings" style="line-height: 14px"></i>
<localize key="general_actions">Actions</localize>
</a>
<a class="btn dropdown-toggle" ng-click="options(content)" data-toggle="dropdown">

3
src/Umbraco.Web.UI.Client/src/views/member/edit.html
View File

@@ -23,7 +23,8 @@
<div class="btn-group" ng-class="{dimmed: content.id === 0}">
<!-- options button -->
<a class="btn" href="#" ng-click="options(content)" prevent-default data-toggle="dropdown">
<i class="icon-settings" style="line-height: 14px"></i> Options
<i class="icon-settings" style="line-height: 14px"></i>
<localize key="general_actions">Actions</localize>
</a>
<a class="btn dropdown-toggle" ng-click="options(content)" data-toggle="dropdown">

3
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
View File

@@ -168,7 +168,7 @@
</area>
<area alias="create">
<key alias="chooseNode">Where do you want to create the new %0%</key>
<key alias="createUnder">Create a page under</key>
<key alias="createUnder">Create an item under</key>
<key alias="updateData">Choose a type and a title</key>
<key alias="noDocumentTypes" version="7.0"><![CDATA[There are no allowed document types available. You must enable these in the settings section under <strong>"document types"</strong>.]]></key>
@@ -304,6 +304,7 @@
<area alias="general">
<key alias="about">About</key>
<key alias="action">Action</key>
<key alias="actions">Actions</key>
<key alias="add">Add</key>
<key alias="alias">Alias</key>
<key alias="areyousure">Are you sure?</key>