Skip to content
Snippets Groups Projects
Commit 552bafbc authored by srosse's avatar srosse
Browse files

OO-990: more icons in authoring tool

parent d14455ef
No related branches found
No related tags found
No related merge requests found
...@@ -71,7 +71,11 @@ public class DropdownRenderer extends DefaultComponentRenderer { ...@@ -71,7 +71,11 @@ public class DropdownRenderer extends DefaultComponentRenderer {
if(component instanceof Spacer) { if(component instanceof Spacer) {
sb.append("<li class='divider'></li>"); sb.append("<li class='divider'></li>");
} else { } else {
sb.append("<li>"); if(component.isEnabled()) {
sb.append("<li>");
} else {
sb.append("<li class='disabled'>");
}
renderer.render(component, sb, args); renderer.render(component, sb, args);
sb.append("</li>"); sb.append("</li>");
} }
......
...@@ -188,6 +188,7 @@ public class AuthoringEntryDetailsController extends RepositoryEntryDetailsContr ...@@ -188,6 +188,7 @@ public class AuthoringEntryDetailsController extends RepositoryEntryDetailsContr
RepositoryHandler handler = repositoryHandlerFactory.getRepositoryHandler(entry); RepositoryHandler handler = repositoryHandlerFactory.getRepositoryHandler(entry);
launchLink = LinkFactory.createToolLink("launch", translate("details.launch"), this, "o_sel_repo_launch"); launchLink = LinkFactory.createToolLink("launch", translate("details.launch"), this, "o_sel_repo_launch");
launchLink.setIconLeftCSS("o_icon o_icon-fw o_icon_details");
launchLink.setEnabled(checkIsRepositoryEntryLaunchable(ureq) && !corrupted); launchLink.setEnabled(checkIsRepositoryEntryLaunchable(ureq) && !corrupted);
if (!isGuestOnly) { if (!isGuestOnly) {
...@@ -202,8 +203,10 @@ public class AuthoringEntryDetailsController extends RepositoryEntryDetailsContr ...@@ -202,8 +203,10 @@ public class AuthoringEntryDetailsController extends RepositoryEntryDetailsContr
} }
downloadLink = LinkFactory.createToolLink("download", translate("details.download"), this, "o_sel_repo_download"); downloadLink = LinkFactory.createToolLink("download", translate("details.download"), this, "o_sel_repo_download");
downloadLink.setIconLeftCSS("o_icon o_icon-fw o_icon_download");
downloadLink.setEnabled(canDownload && !corrupted); downloadLink.setEnabled(canDownload && !corrupted);
downloadCompatLink = LinkFactory.createToolLink("downloadcompat", translate("details.download.compatible"), this, "o_sel_repo_download_backward"); downloadCompatLink = LinkFactory.createToolLink("downloadcompat", translate("details.download.compatible"), this, "o_sel_repo_download_backward");
downloadCompatLink.setIconLeftCSS("o_icon o_icon-fw o_icon_download");
downloadCompatLink.setEnabled(canDownload && !corrupted downloadCompatLink.setEnabled(canDownload && !corrupted
&& "CourseModule".equals(entry.getOlatResource().getResourceableTypeName())); && "CourseModule".equals(entry.getOlatResource().getResourceableTypeName()));
...@@ -222,7 +225,7 @@ public class AuthoringEntryDetailsController extends RepositoryEntryDetailsContr ...@@ -222,7 +225,7 @@ public class AuthoringEntryDetailsController extends RepositoryEntryDetailsContr
editLink.setEnabled(handler.supportsEdit(entry) && !corrupted && !editManaged); editLink.setEnabled(handler.supportsEdit(entry) && !corrupted && !editManaged);
editSettingsLink = LinkFactory.createToolLink("editdesc", translate("details.chprop"), this, "o_sel_repor_edit_properties"); editSettingsLink = LinkFactory.createToolLink("editdesc", translate("details.chprop"), this, "o_sel_repor_edit_properties");
editSettingsLink.setIconLeftCSS("o_icon o_icon_settings"); editSettingsLink.setIconLeftCSS("o_icon o_icon-fw o_icon_settings");
editSettingsLink.setEnabled(!corrupted); editSettingsLink.setEnabled(!corrupted);
if(repositoryModule.isCatalogEnabled()) { if(repositoryModule.isCatalogEnabled()) {
...@@ -235,25 +238,30 @@ public class AuthoringEntryDetailsController extends RepositoryEntryDetailsContr ...@@ -235,25 +238,30 @@ public class AuthoringEntryDetailsController extends RepositoryEntryDetailsContr
&& !closeManaged && !closeManaged
&& (!RepositoryManager.getInstance().createRepositoryEntryStatus(entry.getStatusCode()).isClosed())) { && (!RepositoryManager.getInstance().createRepositoryEntryStatus(entry.getStatusCode()).isClosed())) {
closeLink = LinkFactory.createToolLink("close", translate("details.close.ressoure"), this, "o_sel_repo_close_resource"); closeLink = LinkFactory.createToolLink("close", translate("details.close.ressoure"), this, "o_sel_repo_close_resource");
closeLink.setIconLeftCSS("o_icon o_icon-fw o_icon_close_resource");
closeLink.setEnabled(!corrupted); closeLink.setEnabled(!corrupted);
} }
} }
if(isAuthor) { if(isAuthor) {
copyLink = LinkFactory.createToolLink("close", translate("details.copy"), this, "o_sel_repo_copy"); copyLink = LinkFactory.createToolLink("close", translate("details.copy"), this, "o_sel_repo_copy");
copyLink.setIconLeftCSS("o_icon o_icon-fw o_icon_copy");
boolean copyManaged = RepositoryEntryManagedFlag.isManaged(entry, RepositoryEntryManagedFlag.copy); boolean copyManaged = RepositoryEntryManagedFlag.isManaged(entry, RepositoryEntryManagedFlag.copy);
copyLink.setEnabled((isOwner || entry.getCanCopy()) && !corrupted && !copyManaged); copyLink.setEnabled((isOwner || entry.getCanCopy()) && !corrupted && !copyManaged);
} }
if (isOwner) { if (isOwner) {
deleteLink = LinkFactory.createToolLink("delete", translate("details.delete"), this, "o_sel_repo_delete"); deleteLink = LinkFactory.createToolLink("delete", translate("details.delete"), this, "o_sel_repo_delete");
deleteLink.setIconLeftCSS("o_icon o_icon-fw o_icon_delete_item");
boolean deleteManaged = RepositoryEntryManagedFlag.isManaged(entry, RepositoryEntryManagedFlag.delete); boolean deleteManaged = RepositoryEntryManagedFlag.isManaged(entry, RepositoryEntryManagedFlag.delete);
deleteLink.setEnabled(!corrupted && !deleteManaged); deleteLink.setEnabled(!corrupted && !deleteManaged);
membersLink = LinkFactory.createToolLink("members", translate("details.members"), this, "o_sel_repo_members"); membersLink = LinkFactory.createToolLink("members", translate("details.members"), this, "o_sel_repo_members");
membersLink.setIconLeftCSS("o_icon o_icon-fw o_icon_membersmanagement");
membersLink.setEnabled(!corrupted); membersLink.setEnabled(!corrupted);
orderLink = LinkFactory.createToolLink("order", translate("details.orders"), this, "o_sel_repo_booking"); orderLink = LinkFactory.createToolLink("order", translate("details.orders"), this, "o_sel_repo_booking");
orderLink.setIconLeftCSS("o_icon o_icon-fw o_icon_booking");
boolean booking = acService.isResourceAccessControled(entry.getOlatResource(), null); boolean booking = acService.isResourceAccessControled(entry.getOlatResource(), null);
orderLink.setEnabled(!corrupted && booking); orderLink.setEnabled(!corrupted && booking);
} }
......
...@@ -24,6 +24,7 @@ $fa-css-prefix: "o_icon" !default; ...@@ -24,6 +24,7 @@ $fa-css-prefix: "o_icon" !default;
.o_icon_chat { @extend .o_icon-comment-o; } .o_icon_chat { @extend .o_icon-comment-o; }
.o_icon_check {@extend .o_icon-check; } .o_icon_check {@extend .o_icon-check; }
.o_icon_close {@extend .o_icon-times;} .o_icon_close {@extend .o_icon-times;}
.o_icon_close_resource { @extend .o_icon-stop; }
.o_icon_close_tab {@extend .o_icon-times;} .o_icon_close_tab {@extend .o_icon-times;}
.o_icon_close_tool{ @extend .o_icon-times;} .o_icon_close_tool{ @extend .o_icon-times;}
.o_icon_close_tree {@extend .o_icon-caret-down;} .o_icon_close_tree {@extend .o_icon-caret-down;}
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment