Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use undoredo plugin from aloha #20

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Use undoredo plugin from aloha #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f37334e
Use undoredo plugin from aloha
izak Feb 14, 2014
b7012de
Merge remote-tracking branch 'origin/master' into undoredo
izak Feb 17, 2014
8c957f3
Merge remote-tracking branch 'origin/master' into undoredo
izak Feb 28, 2014
ba60700
Merge remote-tracking branch 'origin/master' into undoredo
izak Mar 3, 2014
6ad39c8
Added metadata plugin
kathi-fletcher Mar 5, 2014
b75f458
Merge remote-tracking branch 'origin/master' into undoredo
TomWoodward Mar 5, 2014
090c1b3
Merge remote-tracking branch 'origin/master' into undoredo
izak Mar 14, 2014
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
1 change: 1 addition & 0 deletions scripts/configs/aloha.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ define ['jquery'], ($) ->
'oer/figure'
'oer/media-embed'
'oer/metadata'
'oer/undoredo'
]

# This whole thing is what's needed to:
Expand Down
6 changes: 6 additions & 0 deletions styles/workspace/menu.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@
.icon-math sup:before {
content: "2+1";
}
.icon-undo:before {
content: "\f0e2";
}
.icon-redo:before {
content: "\f01e";
}

.btn-group.headings .currentHeading {
width: 9em; // Make constant width so the icons don't move around so much. 9em is approximate width of longest current option, "SubSubHeading"
Expand Down
6 changes: 6 additions & 0 deletions templates/workspace/menu/toolbar-aloha.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<!-- Toolbar Buttons -->
<!-- ================= -->


<div class="btn-group headings">
<button class="btn currentHeading" rel="tooltip" title="Text Heading">Nothing</button>
<button class="btn dropdown-toggle" data-toggle="dropdown" rel="tooltip" title="Change Heading">
Expand All @@ -29,6 +30,11 @@
</ul>
</div>

<div class="btn-group iconset">
<button class="btn action undo" rel="tooltip" title="Undo"><i class="icon-undo"></i></button>
<button class="btn action redo" rel="tooltip" title="Redo"><i class="icon-redo"></i></button>
</div>

<div class="btn-group iconset">
<button class="btn action strong" rel="tooltip" title="Bold"><i class="icon-bold"></i></button>
<button class="btn action emphasis" rel="tooltip" title="Italics"><i class="icon-italic"></i></button>
Expand Down