Skip to content
This repository was archived by the owner on Jun 18, 2018. It is now read-only.

Adds localized titles to anchors surrounding icons. #31

Closed
wants to merge 2 commits into from
Closed

Adds localized titles to anchors surrounding icons. #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb5ad7c
StyleCop settings
Aug 26, 2015
dd3693e
Relates to #30 - Adds localized title attributes anchors surrounding …
Aug 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ artifacts/
src/packages/*/**
build/App_plugins/
build/bin/
assets/
assets/
src/Our.Umbraco.NestedContent/Settings.StyleCop
Copy link
Collaborator

@leekelleher leekelleher Oct 2, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will need to be reverted, as we use StyleCop on the project.

2 changes: 1 addition & 1 deletion src/Our.Umbraco.NestedContent/Properties/VersionInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
using System.Runtime.InteropServices;

[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyInformationalVersion("1.0.0-local-000100")]
[assembly: AssemblyInformationalVersion("1.0.6-beta")]
Copy link
Collaborator

@leekelleher leekelleher Oct 2, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like to have this reverted, it's not a big issue, more semantics. AppVeyor CI will overwrite the version number per build anyway.



22 changes: 21 additions & 1 deletion ...ur.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Js/nestedcontent.controllers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,34 @@ angular.module("umbraco").controller("Our.Umbraco.NestedContent.Controllers.Nest
"$filter",
"contentResource",
"Our.Umbraco.NestedContent.Resources.NestedContentResources",
"localizationService",

function ($scope, $interpolate, $filter, contentResource, ncResources) {
function ($scope, $interpolate, $filter, contentResource, ncResources, localizationService) {

//$scope.model.config.contentTypes;
//$scope.model.config.minItems;
//$scope.model.config.maxItems;
//console.log($scope);

$scope.editIconTitle = '';
$scope.moveIconTitle = '';
$scope.deleteIconTitle = '';

// localize the edit icon title
localizationService.localize('general_edit').then(function (value) {
$scope.editIconTitle = value;
});

// localize the delete icon title
localizationService.localize('general_delete').then(function (value) {
$scope.deleteIconTitle = value;
});

// localize the move icon title
localizationService.localize('actions_move').then(function (value) {
$scope.moveIconTitle = value;
});

var inited = false;

_.each($scope.model.config.contentTypes, function (contentType) {
Expand Down
6 changes: 3 additions & 3 deletions src/Our.Umbraco.NestedContent/Web/UI/App_Plugins/NestedContent/Views/nestedcontent.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
<div class="nested-content__heading"><i ng-if="showIcons" class="icon" ng-class="$parent.getIcon($index)"></i><span ng-bind="$parent.getName($index)"></span></div>

<div class="nested-content__icons">
<a class="nested-content__icon nested-content__icon--edit" ng-class="{ 'nested-content__icon--active' : $parent.currentNode.id == node.id }" ng-click="$parent.editNode($index); $event.stopPropagation();" prevent-default>
<a class="nested-content__icon nested-content__icon--edit" title="{{editIconTitle}}" ng-class="{ 'nested-content__icon--active' : $parent.currentNode.id == node.id }" ng-click="$parent.editNode($index); $event.stopPropagation();" prevent-default>
<i class="icon icon-edit"></i>
</a>
<a class="nested-content__icon nested-content__icon--move" ng-click="$event.stopPropagation();" prevent-default>
<a class="nested-content__icon nested-content__icon--move" title="{{moveIconTitle}}" ng-click="$event.stopPropagation();" prevent-default>
<i class="icon icon-navigation"></i>
</a>
<a class="nested-content__icon nested-content__icon--delete" ng-class="{ 'nested-content__icon--disabled': $parent.nodes.length <= $parent.minItems }" ng-click="$parent.deleteNode($index); $event.stopPropagation();" prevent-default>
<a class="nested-content__icon nested-content__icon--delete" title="{{deleteIconTitle}}" ng-class="{ 'nested-content__icon--disabled': $parent.nodes.length <= $parent.minItems }" ng-click="$parent.deleteNode($index); $event.stopPropagation();" prevent-default>
<i class="icon icon-trash"></i>
</a>
</div>
Expand Down