Skip to content
This repository has been archived by the owner on Jul 9, 2024. It is now read-only.

Commit

Permalink
feat(table): adds tooltips to icons
Browse files Browse the repository at this point in the history
  • Loading branch information
Shane Wilson committed Jun 2, 2015
1 parent ffb2fa6 commit e897aac
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 12 deletions.
3 changes: 2 additions & 1 deletion app/scripts/annotations/annotations.table.model.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ module ngApp.projects.models {
id: "project.project_id",
td: row => row.project && '<a href="projects/'+row.project.project_id +
'" data-tooltip="' + row.project.name +
'" data-tooltip-append-to-body="true" data-tooltip-placement="right">' +
'" data-tooltip-popup-delay=1000' +
'" data-tooltip-append-to-body="true">' +
row.project.project_id +
'</a>',
sortable: true
Expand Down
8 changes: 4 additions & 4 deletions app/scripts/cart/cart.table.model.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ module ngApp.cart.models {
{
name: "Action",
id: "file_actions",
td: row =>"<button class='btn btn-primary' download-button files='row' style='margin-right: 10%'>" +
td: row => '<button data-tooltip-popup-delay=1000 data-tooltip="Download"' +
"class='btn btn-primary' download-button files='row' style='margin-right: 10%'>" +
"<i class='fa fa-download'></i></button>" +
"<button class='btn btn-default' remove-single-cart file='row'>" +
"<i class='fa fa-trash-o'></i></button>",
Expand All @@ -38,9 +39,8 @@ module ngApp.cart.models {
}, {
name: "Access",
id: "access",
td: row => '<i class="fa fa-lg fa-'+ (row.access === 'protected' ? 'lock' : 'unlock-alt') +'"></i>',
sortable: true,
tdClassName: "text-center"
td: row => '<i class="fa fa-'+ (row.access === 'protected' ? 'lock' : 'unlock-alt') +'"></i> ' + row.access,
sortable: true
}, {
name: "File Name",
id: "file_name",
Expand Down
5 changes: 4 additions & 1 deletion app/scripts/cart/templates/remove-single.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
<button class="btn btn-default" data-ng-click="remove(file.file_id)"><i class="fa fa-trash-o"></i></button>
<button
data-tooltip-popup-delay=1000
data-tooltip="Remove"
class="btn btn-default" data-ng-click="remove(file.file_id)"><i class="fa fa-trash-o"></i></button>
1 change: 1 addition & 0 deletions app/scripts/components/tables/templates/arrange-columns.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<div class="btn-group Columns" data-dropdown auto-close="outsideClick">
<button type="button" class="btn btn-default dropdown-toggle"
dropdown-toggle aria-expanded="false"
data-tooltip-popup-delay=1000
data-tooltip="Arrange Columns"
data-tooltip-append-to-body="true">
<span class="fa fa-bars"></span>
Expand Down
1 change: 1 addition & 0 deletions app/scripts/components/tables/templates/export-table.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<div class="btn-group" data-dropdown>
<button type="button" class="btn btn-default dropdown-toggle"
data-tooltip="Export Table"
data-tooltip-popup-delay=1000
data-tooltip-append-to-body="true"
dropdown-toggle aria-expanded="false">
<span class="fa fa-table"></span>
Expand Down
1 change: 1 addition & 0 deletions app/scripts/components/tables/templates/sort-table.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<div class="btn-group" data-dropdown auto-close="outsideClick">
<button type="button" class="btn btn-default dropdown-toggle"
data-tooltip="Sort Table"
data-tooltip-popup-delay=1000
data-tooltip-append-to-body="true"
dropdown-toggle aria-expanded="false">
<span class="fa fa-sort-alpha-asc"></span>
Expand Down
12 changes: 6 additions & 6 deletions app/scripts/search/search.files.table.model.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ module ngApp.search.models {
th: '<div add-to-cart-all files="data" paging="paging"></div>',
name: 'Add to Cart',
id: "file_actions",
td: row => '<span add-to-cart-single file="row" style="margin-right:5px"></span>' +
'<a class="btn btn-primary" download-button files="row">' +
td: row => '<span data-tooltip-popup-delay=1000 data-tooltip="Add to Cart" add-to-cart-single file="row" style="margin-right:5px"></span>' +
'<a data-tooltip="Download" data-tooltip-popup-delay=1000 class="btn btn-primary" download-button files="row">' +
'<i class="fa fa-download"></i></a>'
}, {
name: "My Projects",
Expand All @@ -37,9 +37,8 @@ module ngApp.search.models {
}, {
name: "Access",
id: "access",
td: row => '<i class="fa fa-lg fa-'+ (row.access === 'protected' ? 'lock' : 'unlock-alt') +'"></i>',
sortable: true,
tdClassName: "text-center"
td: row => '<i class="fa fa-'+ (row.access === 'protected' ? 'lock' : 'unlock-alt') +'"></i> ' + row.access,
sortable: true
}, {
name: "File Name",
id: "file_name",
Expand All @@ -66,7 +65,8 @@ module ngApp.search.models {
return _.unique(_.map(row.participants, p => {
return '<a href="projects/' + p.project.project_id +
'" data-tooltip="' + p.project.name +
'" data-tooltip-append-to-body="true" data-tooltip-placement="right">'+ p.project.project_id + '</a>';
'" data-tooltip-popup-delay=1000' +
'" data-tooltip-append-to-body="true">'+ p.project.project_id + '</a>';
})).join('<br>');
},
sortable: true
Expand Down
1 change: 1 addition & 0 deletions app/scripts/search/search.participants.table.model.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ module ngApp.search.models {
id: "project.project_id",
td: row => '<a href="projects/'+row.project.project_id +
'" data-tooltip="' + row.project.name +
'" data-tooltip-popup-delay=1000' +
'" data-tooltip-append-to-body="true">' +
row.project.project_id +
'</a>',
Expand Down

0 comments on commit e897aac

Please sign in to comment.