Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0

Browse Source 
* updating vendor files
* updating class syntax (to new FA-based classes) for all UI elements
* correcting broken tests
This commit is contained in:
Chris
2014-11-14 12:44:23 -05:00
committed by Brian Talbot
parent f91c5ffd1f
commit c5d2dd7536
203 changed files with 1826 additions and 1525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/static/coffee/src/instructor_dashboard/membership.coffee
View File

@@ -117,7 +117,7 @@ class AuthListWidget extends MemberListWidget
# create revoke button and insert it into the row
label_trans = gettext("Revoke access")
$revoke_btn = $ _.template('<div class="revoke"><i class="icon-remove-sign"></i> <%= label %></div>', {label: label_trans}),
$revoke_btn = $ _.template('<div class="revoke"><i class="icon fa fa-clock-o"></i> <%= label %></div>', {label: label_trans}),
class: 'revoke'
$revoke_btn.click =>
@modify_member_access member.email, 'revoke', (error) =>
@@ -724,4 +724,4 @@ class Membership
_.defaults window, InstructorDashboard: {}
_.defaults window.InstructorDashboard, sections: {}
_.defaults window.InstructorDashboard.sections,
Membership: Membership
Membership: Membership

50
lms/static/sass/course/wiki/_wiki.scss
View File

@@ -278,30 +278,6 @@ section.wiki {
color: $link-color;
font-weight: bold;
background-color: $gray-l4;
.icon-view,
.icon-home {
background-position: -25px 0;
}
.icon-edit {
background-position: -25px -25px;
}
.icon-changes,
.icon-time {
background-position: -25px -49px;
}
.icon-attachments,
.icon-file {
background-position: -25px -73px;
}
.icon-settings {
background-position: -25px -99px;
}
}
}
}
@@ -318,38 +294,14 @@ section.wiki {
float: left;
display: block;
width: 25px;
height: 25px;
margin-right: 3px;
background: url(../images/wiki-icons.png) no-repeat;
margin-top: 5px;
}
[class^="icon-"] {
padding-right: ($baseline/4);
}
.icon-view,
.icon-home {
background-position: 0 0;
}
.icon-edit {
background-position: 0 -25px;
}
.icon-changes,
.icon-time {
background-position: 0 -49px;
}
.icon-attachments,
.icon-file {
background-position: 0 -73px;
}
.icon-settings {
background-position: 0 -99px;
}
&:hover, &:focus {
background-color: $gray-l6;
text-decoration: none;

1
lms/static/sass/discussion/_discussion.scss
View File

@@ -11,7 +11,6 @@ body.discussion {
}
.new-post-icon {
margin-top: 8px;
@include margin-right(7px);
font-size: 16px;
vertical-align: middle;

2
lms/static/sass/discussion/elements/_navigation.scss
View File

@@ -213,7 +213,7 @@
color: $gray-l2;
}
.icon-ok {
.icon-check {
color: $forum-color-marked-answer;
}

6
lms/templates/combinedopenended/combined_open_ended_results.html
View File

@@ -23,8 +23,8 @@
% if i == 0:
disabled="true"
% endif
><i class="icon-chevron-left"></i></button>
% endif
><i class="icon fa fa-chevron-left"></i></button>
% endif
## Translators: an example of what this string will look
## like is: "Scored rubric from grader 1", where
## "Scored rubric" replaces {result_of_task} and
@@ -39,7 +39,7 @@
% if (i+1) >= num_results:
disabled="true"
% endif
><i class="icon-chevron-right"></i></button>
><i class="fa-chevron-right"></i></button>
% endif
</span>
</div>

22
lms/templates/courseware/course_about.html
View File

@@ -232,10 +232,10 @@
## want here (and on this whole page, really).
% if self.stanford_theme_enabled():
<a href="http://twitter.com/intent/tweet?text=I+just+registered+for+${course.number}+${get_course_about_section(course, 'title')}!+(http://class.stanford.edu)" class="share">
<i class="icon icon-twitter"></i><span class="sr">Tweet that you've registered for this course</span>
<i class="icon fa fa-twitter"></i><span class="sr">Tweet that you've registered for this course</span>
</a>
<a href="mailto:?subject=Take%20a%20course%20at%20Stanford%20online!&body=I%20just%20registered%20for%20${course.number}%20${get_course_about_section(course, 'title')}+(http://class.stanford.edu)" class="share">
<i class="icon icon-envelope"></i><span class="sr">Email someone to say you've registered for this course</span>
<i class="icon fa fa-envelope"></i><span class="sr">Email someone to say you've registered for this course</span>
</a>
% else:
<%
@@ -271,13 +271,13 @@
).replace(u" ", u"%20")
%>
<a href="${tweet_action}" class="share">
<i class="icon icon-twitter"></i><span class="sr">Tweet that you've registered for this course</span>
<i class="icon fa fa-twitter"></i><span class="sr">Tweet that you've registered for this course</span>
</a>
<a href="${facebook_link}" class="share">
<i class="icon icon-thumbs-up"></i><span class="sr">Post a Facebook message to say you've registered for this course</span>
<i class="icon fa fa-thumbs-up"></i><span class="sr">Post a Facebook message to say you've registered for this course</span>
</a>
<a href="${email_subject}" class="share">
<i class="icon icon-envelope"></i><span class="sr">Email someone to say you've registered for this course</span>
<i class="icon fa fa-envelope"></i><span class="sr">Email someone to say you've registered for this course</span>
</a>
% endif
</div>
@@ -285,15 +285,15 @@
</header>
<ol class="important-dates">
<li class="important-dates-item"><i class="icon icon-info-sign"></i><p class="important-dates-item-title">${_("Course Number")}</p><span class="important-dates-item-text course-number">${course.display_number_with_default | h}</span></li>
<li class="important-dates-item"><i class="icon fa fa-info-sign"></i><p class="important-dates-item-title">${_("Course Number")}</p><span class="important-dates-item-text course-number">${course.display_number_with_default | h}</span></li>
% if not course.start_date_is_still_default:
<li class="important-dates-item"><i class="icon icon-calendar"></i><p class="important-dates-item-title">${_("Classes Start")}</p><span class="important-dates-item-text start-date">${course.start_datetime_text()}</span></li>
<li class="important-dates-item"><i class="icon fa fa-calendar"></i><p class="important-dates-item-title">${_("Classes Start")}</p><span class="important-dates-item-text start-date">${course.start_datetime_text()}</span></li>
% endif
## We plan to ditch end_date (which is not stored in course metadata),
## but for backwards compatibility, show about/end_date blob if it exists.
% if get_course_about_section(course, "end_date") or course.end:
<li class="important-dates-item">
<i class="icon icon-calendar"></i>
<i class="icon fa fa-calendar"></i>
<p class="important-dates-item-title">${_("Classes End")}</p>
<span class="important-dates-item-text final-date">
% if get_course_about_section(course, "end_date"):
@@ -306,10 +306,10 @@
% endif
% if get_course_about_section(course, "effort"):
<li class="important-dates-item"><i class="icon icon-pencil"></i><p class="important-dates-item-title">${_("Estimated Effort")}</p><span class="important-dates-item-text effort">${get_course_about_section(course, "effort")}</span></li>
<li class="important-dates-item"><i class="icon fa fa-pencil"></i><p class="important-dates-item-title">${_("Estimated Effort")}</p><span class="important-dates-item-text effort">${get_course_about_section(course, "effort")}</span></li>
% endif
##<li class="important-dates-item"><i class="icon icon-time"></i><p class="important-dates-item-title">${_('Course Length')}</p><span class="important-dates-item-text course-length">${_('{number} weeks').format(number=15)}</span></li>
##<li class="important-dates-item"><i class="icon fa fa-clock-o"></i><p class="important-dates-item-title">${_('Course Length')}</p><span class="important-dates-item-text course-length">${_('{number} weeks').format(number=15)}</span></li>
%if is_shopping_cart_enabled and registration_price:
<li class="important-dates-item">
@@ -320,7 +320,7 @@
% endif
% if get_course_about_section(course, "prerequisites"):
<li class="important-dates-item"><i class="icon icon-book"></i><p class="important-dates-item-title">${_("Prerequisites")}</p><span class="important-dates-item-text prerequisites">${get_course_about_section(course, "prerequisites")}</span></li>
<li class="important-dates-item"><i class="icon fa fa-book"></i><p class="important-dates-item-title">${_("Prerequisites")}</p><span class="important-dates-item-text prerequisites">${get_course_about_section(course, "prerequisites")}</span></li>
% endif
</ol>
</section>

4
lms/templates/courseware/courseware.html
View File

@@ -217,8 +217,8 @@ ${fragment.foot_html()}
% if show_chat:
<div id="chat-wrapper">
<div id="chat-toggle" class="closed">
<span id="chat-open">Open Chat <em class="icon-chevron-up"></em></span>
<span id="chat-close">Close Chat <em class="icon-chevron-down"></em></span>
<span id="chat-open">Open Chat <em class="icon fa fa-chevron-up"></em></span>
<span id="chat-close">Close Chat <em class="icon fa fa-chevron-down"></em></span>
</div>
<div id="chat-block">
## The Candy.js plugin wants to render in an element with #candy

6
lms/templates/courseware/legacy_instructor_dashboard.html
View File

@@ -141,7 +141,7 @@ function goto( mode)
%if settings.FEATURES.get('IS_EDX_DOMAIN', False):
## Only show this banner on the edx.org website (other sites may choose to show this if they wish)
<div class="wrapper-msg urgency-low msg-warning is-shown">
<p>${_("You are using the legacy instructor dashboard, which we will retire in the near future.")} <a href="${ standard_dashboard_url }">${_("Return to the Instructor Dashboard")} <i class="icon-double-angle-right"></i></a></p>
<p>${_("You are using the legacy instructor dashboard, which we will retire in the near future.")} <a href="${ standard_dashboard_url }">${_("Return to the Instructor Dashboard")} <i class="icon fa fa-double-angle-right"></i></a></p>
<p class="note">${_("If the Instructor Dashboard is missing functionality, please contact your PM to let us know.")}</p>
</div>
%endif
@@ -477,14 +477,14 @@ function goto( mode)
<div class="metrics-tooltip" id="metric_tooltip_${i}"></div>
<div class="metrics-left" id="metric_opened_${i}">
<h3>${_("Count of Students that Opened a Subsection")}</h3>
<p class="loading"><i class="icon-spinner icon-spin icon-large"></i>${_("Loading...")}</p>
<p class="loading"><i class="icon fa fa-spinner fa-spin fa-large"></i>${_("Loading...")}</p>
</div>
<div class="metrics-right" id="metric_grade_${i}">
<h3>${_("Grade Distribution per Problem")}</h3>
%if not metrics_results['section_has_problem'][i]:
<p>${_("There are no problems in this section.")}</p>
%else:
<p class="loading"><i class="icon-spinner icon-spin icon-large"></i>${_("Loading...")}</p>
<p class="loading"><i class="icon fa fa-spinner fa-spin fa-large"></i>${_("Loading...")}</p>
%endif
</div>
</div>

14
lms/templates/dashboard.html
View File

@@ -111,9 +111,9 @@
<div class="status">
% if state.has_account:
<i class="icon icon-link"></i> <span class="copy">${_("Linked")}</span>
<i class="icon fa fa-link"></i> <span class="copy">${_("Linked")}</span>
% else:
<i class="icon icon-unlink"></i><span class="copy">${_("Not Linked")}</span>
<i class="icon fa fa-unlink"></i><span class="copy">${_("Not Linked")}</span>
% endif
</div>
@@ -228,7 +228,7 @@
<section id="email-settings-modal" class="modal" aria-hidden="true">
<div class="inner-wrapper" role="dialog" aria-labelledby="email-settings-title">
<button class="close-modal">
<i class="icon-remove"></i>
<i class="icon fa fa-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_("Close")}
@@ -261,7 +261,7 @@
<section id="password_reset_complete" class="modal" aria-hidden="true">
<div class="inner-wrapper" role="dialog" aria-labelledby="password-reset-email">
<button class="close-modal">
<i class="icon-remove"></i>
<i class="icon fa fa-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_("Close")}
@@ -291,7 +291,7 @@
<section id="change_email" class="modal" aria-hidden="true">
<div class="inner-wrapper" role="dialog" aria-labelledby="change_email_title">
<button class="close-modal">
<i class="icon-remove"></i>
<i class="icon fa fa-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_("Close")}
@@ -335,7 +335,7 @@
<section id="apply_name_change" class="modal" aria-hidden="true">
<div class="inner-wrapper" role="dialog" aria-labelledby="change-name-title">
<button class="close-modal">
<i class="icon-remove"></i>
<i class="icon fa fa-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_("Close")}
@@ -378,7 +378,7 @@
<section id="unenroll-modal" class="modal unenroll-modal" aria-hidden="true">
<div class="inner-wrapper" role="dialog" aria-labelledby="unenrollment-modal-title">
<button class="close-modal">
<i class="icon-remove"></i>
<i class="icon fa fa-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_("Close")}

2
lms/templates/dashboard/_dashboard_course_listing.html
View File

@@ -169,7 +169,7 @@ from student.helpers import (
<div class="wrapper-tip">
<h4 class="message-title">
<i class="icon-caret-down ui-toggle-expansion"></i>
<i class="icon fa fa-caret-down ui-toggle-expansion"></i>
<span class="value">${_("Challenge Yourself!")}</span>
</h4>
<p class="message-copy">${_("Take this course as an ID-verified student.")}</p>

2
lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html
View File

@@ -80,7 +80,7 @@
% endfor
</div>
<div class="action-dismiss">
<button class="button-dismiss" id="failed-verification-button-dismiss"><i class="icon-remove-sign"></i> <span class="sr">${_('Dismiss')}</span></button>
<button class="button-dismiss" id="failed-verification-button-dismiss"><i class="icon fa fa-times-circle"></i> <span class="sr">${_('Dismiss')}</span></button>
</div>
</div>
</div>

8
lms/templates/dashboard/_dashboard_reverification_sidebar.html
View File

@@ -11,25 +11,25 @@
% if reverifications["must_reverify"]:
% for item in reverifications["must_reverify"]:
<li class="status-item is-open"><i class="icon-circle-blank"></i><span class="label">${_('Re-verify now:')}</span> <span class="course-name"><a href="${reverse('verify_student_midcourse_reverify_dash')}">${item.course_name}</span></a></li>
<li class="status-item is-open"><i class="icon fa fa-circle-blank"></i><span class="label">${_('Re-verify now:')}</span> <span class="course-name"><a href="${reverse('verify_student_midcourse_reverify_dash')}">${item.course_name}</span></a></li>
% endfor
%endif
% if reverifications["pending"]:
% for item in reverifications["pending"]:
<li class="status-item is-pending"><i class="icon-circle-blank"></i><span class="label">${_('Pending:')}</span> <span class="course-name"><a href="${reverse('verify_student_midcourse_reverify_dash')}">${item.course_name}</span></a></li>
<li class="status-item is-pending"><i class="icon fa fa-circle-blank"></i><span class="label">${_('Pending:')}</span> <span class="course-name"><a href="${reverse('verify_student_midcourse_reverify_dash')}">${item.course_name}</span></a></li>
% endfor
%endif
% if reverifications["denied"]:
% for item in reverifications["denied"]:
<li class="status-item is-denied"><i class="icon-remove-sign"></i><span class="label">${_('Denied:')}</span> <span class="course-name"><a href="${reverse('verify_student_midcourse_reverify_dash')}">${item.course_name}</span></a></li>
<li class="status-item is-denied"><i class="icon fa fa-times-circle"></i><span class="label">${_('Denied:')}</span> <span class="course-name"><a href="${reverse('verify_student_midcourse_reverify_dash')}">${item.course_name}</span></a></li>
% endfor
%endif
% if reverifications["approved"]:
% for item in reverifications["approved"]:
<li class="status-item is-approved"><i class="icon-ok"></i><span class="label">${_('Approved:')}</span> <span class="course-name"><a href="${reverse('verify_student_midcourse_reverify_dash')}">${item.course_name}</span></a></li>
<li class="status-item is-approved"><i class="icon fa fa-check-square-o"></i><span class="label">${_('Approved:')}</span> <span class="course-name"><a href="${reverse('verify_student_midcourse_reverify_dash')}">${item.course_name}</span></a></li>
% endfor
%endif
</ul>

2
lms/templates/discussion/_discussion_course_navigation.html
View File

@@ -4,6 +4,6 @@
<%block name="extratabs">
% if has_permission(user, 'create_thread', course.id):
<li class="right"><a href="#" class="new-post-btn" role="button"><span class="icon icon-edit new-post-icon"></span>${_("New Post")}</a></li>
<li class="right"><a href="#" class="new-post-btn" role="button"><span class="icon fa fa-edit new-post-icon"></span>${_("New Post")}</a></li>
% endif
</%block>

2
lms/templates/discussion/_discussion_module.html
View File

@@ -5,6 +5,6 @@
<div class="discussion-module" data-discussion-id="${discussion_id | h}">
<a class="discussion-show control-button" href="javascript:void(0)" data-discussion-id="${discussion_id | h}" role="button"><span class="show-hide-discussion-icon"></span><span class="button-text">${_("Show Discussion")}</span></a>
% if has_permission(user, 'create_thread', course.id):
<a href="#" class="new-post-btn" role="button"><span class="icon icon-edit new-post-icon"></span>${_("New Post")}</a>
<a href="#" class="new-post-btn" role="button"><span class="icon fa fa-edit new-post-icon"></span>${_("New Post")}</a>
% endif
</div>

2
lms/templates/discussion/_discussion_module_studio.html
View File

@@ -3,7 +3,7 @@
<div class="discussion-module" data-discussion-id="${discussion_id | h}">
<p>
<span class="discussion-preview">
<span class="icon icon-comment"/>
<span class="icon fa fa-comment"/>
${_("To view live discussions, click Preview or View Live in Unit Settings.")}<br />
${_("Discussion ID: {discussion_id}").format(discussion_id=discussion_id)}
</span>

4
lms/templates/discussion/_filter_dropdown.html
View File

@@ -35,7 +35,7 @@
<label>
<span class="sr">${_("Filter Topics")}</span>
<input type="text" class="forum-nav-browse-filter-input" placeholder="${_("filter topics")}">
<i class="icon icon-filter"></i>
<i class="icon fa fa-filter"></i>
</label>
</form>
<ul class="forum-nav-browse-menu">
@@ -43,7 +43,7 @@
<a href="#" class="forum-nav-browse-title">${_("All Discussions")}</a>
</li>
<li class="forum-nav-browse-menu-item forum-nav-browse-menu-following">
<a href="#" class="forum-nav-browse-title"><i class="icon icon-star"></i>${_("Posts I'm Following")}</a>
<a href="#" class="forum-nav-browse-title"><i class="icon fa fa-star"></i>${_("Posts I'm Following")}</a>
</li>
${render_dropdown(category_map)}
</ul>

4
lms/templates/discussion/_thread_list_template.html
View File

@@ -5,14 +5,14 @@
## There is no whitespace between these because the front-end JS code
## needs to precisely compute the available width for forum-nav-
## browse-current in order to do truncation of topic names.
<i class="icon icon-reorder"></i><span class="sr">${_("Discussion topics; current selection is: ")}</span><span class="forum-nav-browse-current">${_("All Discussions")}</span><span class="forum-nav-browse-drop-arrow">▾</span>
<i class="icon fa fa-reorder"></i><span class="sr">${_("Discussion topics; current selection is: ")}</span><span class="forum-nav-browse-current">${_("All Discussions")}</span><span class="forum-nav-browse-drop-arrow">▾</span>
</a>
<form class="forum-nav-search">
<div class="forum-nav-search-ff-position-fix">
<label>
<span class="sr">${_("Search")}</span>
<input class="forum-nav-search-input" type="text" placeholder="${_("Search all posts")}">
<i class="icon icon-search"></i>
<i class="icon fa fa-search"></i>
</label>
</div>
</form>

62
lms/templates/discussion/_underscore_templates.html
View File

@@ -19,7 +19,7 @@
<div class="response-count"/>
<div class="add-response">
<button class="button add-response-btn">
<i class="icon icon-reply"></i>
<i class="icon fa fa-reply"></i>
<span class="add-response-btn-text">${_('Add A Response')}</span>
</button>
</div>
@@ -41,8 +41,8 @@
</div>
</div>
<div class="post-tools">
<a href="javascript:void(0)" class="forum-thread-expand"><span class="icon icon-plus"/> ${_("Expand discussion")}</a>
<a href="javascript:void(0)" class="forum-thread-collapse"><span class="icon icon-minus"/> ${_("Collapse discussion")}</a>
<a href="javascript:void(0)" class="forum-thread-expand"><span class="icon fa fa-plus"/> ${_("Expand discussion")}</a>
<a href="javascript:void(0)" class="forum-thread-collapse"><span class="icon fa fa-minus"/> ${_("Collapse discussion")}</a>
</div>
</article>
</script>
@@ -72,7 +72,7 @@
<div class="discussion-response"></div>
<a href="#" class="action-show-comments">
${u"<%- interpolate('{}', {{num_comments: comments.length}}, true) %>".format(escapejs(_("Show Comments (%(num_comments)s)")))}
<i class="icon icon-caret-down"></i>
<i class="icon fa fa-caret-down"></i>
</a>
<ol class="comments">
<li class="new-comment">
@@ -126,7 +126,7 @@
${"<% if (obj.endorsement) { %> - <%="}${js_block}${"%><% } %>"}
</p>
<div class="post-labels">
<span class="post-label-reported"><i class="icon icon-flag"></i>${_("Reported")}</span>
<span class="post-label-reported"><i class="icon fa fa-flag"></i>${_("Reported")}</span>
</div>
</div>
<div class="response-header-actions">
@@ -188,7 +188,7 @@
${'<%='}${js_block}${'%>'}
</p>
<div class="post-labels">
<span class="post-label-reported"><i class="icon icon-flag"></i>${_("Reported")}</span>
<span class="post-label-reported"><i class="icon fa fa-flag"></i>${_("Reported")}</span>
</div>
</div>
</script>
@@ -212,13 +212,13 @@
${u"""<%
var icon_class, sr_text;
if (thread_type == "discussion") {{
icon_class = "icon-comments";
icon_class = "fa-comments";
sr_text = "{discussion}";
}} else if (endorsed) {{
icon_class = "icon-ok";
icon_class = "fa-check-square-o";
sr_text = "{answered_question}";
}} else {{
icon_class = "icon-question";
icon_class = "fa-question";
sr_text = "{unanswered_question}";
}}
%>""".format(
@@ -230,23 +230,23 @@
unanswered_question=escapejs(_("unanswered question"))
)}
<span class="sr">${"<%= sr_text %>"}</span>
<i class="icon ${"<%= icon_class %>"}"></i>
<i class="icon fa ${"<%= icon_class %>"}"></i>
</div><div class="forum-nav-thread-wrapper-1">
<span class="forum-nav-thread-title">${"<%- title %>"}</span>
<%
js_block = u"""
var labels = "";
if (pinned) {{
labels += '<li class="post-label-pinned"><i class="icon icon-pushpin"></i>{pinned_text}</li> ';
labels += '<li class="post-label-pinned"><i class="icon fa fa-thumb-tack"></i>{pinned_text}</li> ';
}}
if (typeof(subscribed) != "undefined" && subscribed) {{
labels += '<li class="post-label-following"><i class="icon icon-star"></i>{following_text}</li> ';
labels += '<li class="post-label-following"><i class="icon fa fa-star"></i>{following_text}</li> ';
}}
if (staff_authored) {{
labels += '<li class="post-label-by-staff"><i class="icon icon-user"></i>{staff_text}</li> ';
labels += '<li class="post-label-by-staff"><i class="icon fa fa-user"></i>{staff_text}</li> ';
}}
if (community_ta_authored) {{
labels += '<li class="post-label-by-community-ta"><i class="icon icon-user"></i>{community_ta_text}</li> ';
labels += '<li class="post-label-by-community-ta"><i class="icon fa fa-user"></i>{community_ta_text}</li> ';
}}
if (labels != "") {{
print('<ul class="forum-nav-thread-labels">' + labels + '</ul>');
@@ -323,30 +323,30 @@
<tr class="helpgrid-row helpgrid-row-navigation">
<td class="row-title">${_("Find discussions")}</td>
<td class="row-item">
<i class="icon icon-reorder"></i>
<i class="icon fa fa-reorder"></i>
<span class="row-description">${_("Focus in on specific topics")}</span>
</td>
<td class="row-item">
<i class="icon icon-search"></i>
<i class="icon fa fa-search"></i>
<span class="row-description">${_("Search for specific posts ")}</span>
</td>
<td class="row-item">
<i class="icon icon-sort"></i>
<i class="icon fa fa-sort"></i>
<span class="row-description">${_("Sort by date, vote, or comments")}</span>
</td>
</tr>
<tr class="helpgrid-row helpgrid-row-participation">
<td class="row-title">${_("Engage with posts")}</td>
<td class="row-item">
<i class="icon icon-plus"></i>
<i class="icon fa fa-plus"></i>
<span class="row-description">${_("Upvote posts and good responses")}</span>
</td>
<td class="row-item">
<i class="icon icon-flag"></i>
<i class="icon fa fa-flag"></i>
<span class="row-description">${_("Report Forum Misuse")}</span>
</td>
<td class="row-item">
<i class="icon icon-star"></i>
<i class="icon fa fa-star"></i>
<span class="row-description">${_("Follow posts for updates")}</span>
</td>
</tr>
@@ -357,7 +357,7 @@
<span class="sr">${_("Toggle Notifications Setting")}</span>
<span class="notification-checkbox">
<input type="checkbox" id="email-setting-checkbox" class="email-setting" name="email-notification"/>
<i class="icon icon-envelope"></i>
<i class="icon fa fa-envelope"></i>
</span>
</label>
<span class="row-description">${_("Check this box to receive an email digest once a day notifying you about new, unread activity from posts you are following.")}</span>
@@ -375,7 +375,7 @@
</div>
<div class="search-alert-controls">
<a href="#" class="dismiss control control-dismiss"><i class="icon icon-remove"></i></a>
<a href="#" class="dismiss control control-dismiss"><i class="icon fa fa-remove"></i></a>
</div>
</div>
</script>
@@ -413,7 +413,7 @@
<div class="post-options">
<label class="post-option is-enabled">
<input type="checkbox" name="follow" class="post-option-input js-follow" checked>
<i class="icon icon-star"></i>${_("follow this post")}
<i class="icon fa fa-star"></i>${_("follow this post")}
</label>
${'<% if (allow_anonymous) { %>'}
<label class="post-option">
@@ -445,13 +445,13 @@
</span><fieldset class="field-input">
<input type="radio" name="${"<%= form_id %>"}-post-type" class="post-type-input" id="${"<%= form_id %>"}-post-type-question" value="question">
<label for="${"<%= form_id %>"}-post-type-question" class="post-type-label">
<i class="icon icon-question"></i>
<i class="icon fa fa-question"></i>
## Translators: This is a forum post type
${_("Question")}
</label>
<input type="radio" name="${"<%= form_id %>"}-post-type" class="post-type-input" id="${"<%= form_id %>"}-post-type-discussion" value="discussion" checked>
<label for="${"<%= form_id %>"}-post-type-discussion" class="post-type-label">
<i class="icon icon-comments"></i>
<i class="icon fa fa-comments"></i>
## Translators: This is a forum post type
${_("Discussion")}
</label>
@@ -506,7 +506,7 @@
<span class="label-unchecked">${unchecked_label}</span>
<span class="label-checked">${checked_label}</span>
</span>
<span class="action-icon"><i class="icon icon-${icon}"></i></span>
<span class="action-icon"><i class="icon fa fa-${icon}"></i></span>
</a>
</li>
</script>
@@ -531,7 +531,7 @@ ${primaryAction("follow", "star", _("Follow"), _("Follow"), _("Unfollow"))}
</span>
<span class="action-icon" aria-hidden="true">
<i class="icon icon-plus"></i>
<i class="icon fa fa-plus"></i>
</span>
</a>
</li>
@@ -547,7 +547,7 @@ ${primaryAction("follow", "star", _("Follow"), _("Follow"), _("Unfollow"))}
<span class="label-checked">${checked_label}</span>
</span>
<span class="action-icon">
<i class="icon icon-${icon}"></i>
<i class="icon fa fa-${icon}"></i>
</span>
</a>
</li>
@@ -555,7 +555,7 @@ ${primaryAction("follow", "star", _("Follow"), _("Follow"), _("Unfollow"))}
</%def>
${secondaryStateAction("report", "flag", _("Report abuse"), _("Report"), _("Unreport"))}
${secondaryStateAction("pin", "pushpin", _("Pin"), _("Pin"), _("Unpin"))}
${secondaryStateAction("pin", "thumb-tack", _("Pin"), _("Pin"), _("Unpin"))}
${secondaryStateAction("close", "lock", _("Close"), _("Close"), _("Open"))}
<%def name="secondaryAction(action_class, icon, label)">
@@ -563,7 +563,7 @@ ${secondaryStateAction("close", "lock", _("Close"), _("Close"), _("Open"))}
<li class="actions-item">
<a href="javascript:void(0)" class="action-list-item action-${action_class}" role="button">
<span class="action-label">${label}</span>
<span class="action-icon"><i class="icon icon-${icon}"></i></span>
<span class="action-icon"><i class="icon fa fa-${icon}"></i></span>
</a>
</li>
</script>
@@ -579,7 +579,7 @@ ${secondaryAction("delete", "remove", _("Delete"))}
<div class="more-wrapper">
<a href="javascript:void(0)" class="action-button action-more" role="button" aria-haspopup="true" aria-controls="action-menu-${"<%= contentId %>"}">
<span class="action-label">${_("More")}</span>
<span class="action-icon"><i class="icon icon-ellipsis-horizontal"></i></span>
<span class="action-icon"><i class="icon fa fa-ellipsis-h"></i></span>
</a>
<div class="actions-dropdown" id="action-menu-${"<%= contentType %>"}" aria-expanded="false">
<ul class="actions-dropdown-list">

10
lms/templates/footer-edx-new.html
View File

@@ -59,23 +59,23 @@
<div class="footer-follow-links">
<a href="${settings.PLATFORM_TWITTER_URL}" title="Twitter">
<i class="icon icon-twitter element-invisible"></i>
<i class="icon fa fa-twitter element-invisible"></i>
<span class="copy">${_("Twitter")}</span>
</a>
<a href="${settings.PLATFORM_FACEBOOK_ACCOUNT}" title="Facebook">
<i class="icon icon-facebook-sign element-invisible"></i>
<i class="icon fa fa-facebook-sign element-invisible"></i>
<span class="copy">${_("Facebook")}</span>
</a>
<a href="${settings.PLATFORM_MEETUP_URL}" title="Meetup">
<i class="icon icon-calendar element-invisible"></i>
<i class="icon fa fa-calendar element-invisible"></i>
<span class="copy">${_("Meetup")}</span>
</a>
<a href="${settings.PLATFORM_LINKEDIN_URL}" title="LinkedIn">
<i class="icon icon-linkedin-sign element-invisible"></i>
<i class="icon fa fa-linkedin-sign element-invisible"></i>
<span class="copy">${_("LinkedIn")}</span>
</a>
<a href="${settings.PLATFORM_GOOGLE_PLUS_URL}" title="Google+">
<i class="icon icon-google-plus-sign element-invisible"></i>
<i class="icon fa fa-google-plus-sign element-invisible"></i>
<span class="copy">${_("Google+")}</span>
</a>
</div>

4
lms/templates/forgot_password_modal.html
View File

@@ -5,7 +5,7 @@
<section id="forgot-password-modal" class="modal" role="dialog" tabindex="-1" aria-label="${_('Password Reset')}">
<div class="inner-wrapper">
<button class="close-modal">
<i class="icon-remove"></i>
<i class="icon fa fa-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_('Close')}
@@ -64,7 +64,7 @@
$("#forgot-password-modal").attr("aria-hidden", "true");
$("#forgot-password-link").focus();
};
var cycle_modal_tab = function(from_element_name, to_element_name) {
$(from_element_name).on('keydown', function(e) {
var keyCode = e.keyCode || e.which;

6
lms/templates/help_modal.html
View File

@@ -19,7 +19,7 @@
<div class="inner-wrapper" id="help_wrapper">
## TODO: find a way to refactor this
<button class="close-modal "tabindex="0">
<i class="icon-remove"></i>
<i class="icon fa fa-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_('Close')}
@@ -75,7 +75,7 @@
<div class="inner-wrapper" id="feedback_form_wrapper">
<button class="close-modal">
<i class="icon-remove"></i>
<i class="icon fa fa-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_('Close')}
@@ -109,7 +109,7 @@
<div class="inner-wrapper" id="feedback_success_wrapper" tabindex="0">
<button class="close-modal" tabindex="0">
<i class="icon-remove"></i>
<i class="icon fa fa-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_('Close')}

2
lms/templates/instructor/instructor_dashboard_2/add_coupon_modal.html
View File

@@ -4,7 +4,7 @@
<section id="add-coupon-modal" class="modal" role="dialog" tabindex="-1" aria-label="${_('Add Coupon')}">
<div class="inner-wrapper">
<button class="close-modal">
<i class="icon-remove"></i>
<i class="icon fa fa-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_('Close')}

4
lms/templates/instructor/instructor_dashboard_2/e-commerce.html
View File

@@ -129,8 +129,8 @@
$(function () {
var icons = {
header: "ui-icon-circle-arrow-e",
activeHeader: "ui-icon-circle-arrow-s"
header: "ui-fa-circle-arrow-e",
activeHeader: "ui-fa-circle-arrow-s"
};
var act = 0;
$("#accordion").accordion(

2
lms/templates/instructor/instructor_dashboard_2/edit_coupon_modal.html
View File

@@ -4,7 +4,7 @@
<section id="edit-coupon-modal" class="modal" role="dialog" tabindex="-1" aria-label="${_('Edit Coupon')}">
<div class="inner-wrapper">
<button class="close-modal">
<i class="icon-remove"></i>
<i class="icon fa fa-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_('Close')}

2
lms/templates/instructor/instructor_dashboard_2/generate_registarion_codes_modal.html
View File

@@ -4,7 +4,7 @@
<section id="registration_code_generation_modal" class="modal" role="dialog" tabindex="-1" aria-label="${_('Generate Registration Code Modal')}">
<div class="inner-wrapper">
<button class="close-modal">
<i class="icon-remove"></i>
<i class="icon fa fa-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_('Close')}

4
lms/templates/instructor/instructor_dashboard_2/metrics.html
View File

@@ -55,7 +55,7 @@
</div>
<input class="download-csv metrics-student-opened" type="button" name="dump_student_opened" value="${_("Download Student Opened as a CSV")}" data-endpoint="${section_data['get_students_opened_subsection_url']}" data-csv="true">
<input class="download-csv metrics-student-grades" type="button" name="dump_student_grades" value="${_("Download Student Grades as a CSV")}" data-endpoint="${section_data['get_students_problem_grades_url']}" data-csv="true">
<a class="close-button" href="#"><i class="icon-remove"></i><span class="sr">${_("Close")}</span></a>
<a class="close-button" href="#"><i class="icon fa fa-remove"></i><span class="sr">${_("Close")}</span></a>
</div>
</div>
</div>
@@ -152,7 +152,7 @@
var nothingText = "${_('There are no problems in this section.')}";
var loadingText = "${_('Loading...')}";
var nothingP = '<p class="nothing">' + nothingText + '</p>';
var loading = '<p class="loading"><i class="icon-spinner icon-spin icon-large"></i>' + loadingText + '</p>';
var loading = '<p class="loading"><i class="icon fa fa-spinner fa-spin fa-large"></i>' + loadingText + '</p>';
// Display spinners or "There are no problems in this section" message
$('.metrics-left').each(function() {

2
lms/templates/instructor/instructor_dashboard_2/set_course_mode_price_modal.html
View File

@@ -4,7 +4,7 @@
<section id="set-course-mode-price-modal" class="modal" role="dialog" tabindex="-1" aria-label="${_('Set Course Mode Price')}">
<div class="inner-wrapper">
<button class="close-modal">
<i class="icon-remove"></i>
<i class="icon fa fa-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_('Close')}

2
lms/templates/lti.html
View File

@@ -33,7 +33,7 @@
% endif
<p class="lti-link external"><a target="_blank" class="link_lti_new_window" href="${form_url}">
${button_text or _('View resource in a new window')}
<i class="icon-external-link"></i>
<i class="icon fa fa-external-link"></i>
</a></p>
</div>
% else:

2
lms/templates/modal/_modal-settings-language.html
View File

@@ -8,7 +8,7 @@
<section id="change_language" class="modal modal-settings-language" aria-hidden="true">
<div class="inner-wrapper" role="dialog" aria-labelledby="change_language_title">
<button class="close-modal">
<i class="icon-remove"></i>
<i class="icon fa fa-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_('Close')}

2
lms/templates/modal/accessible_confirm.html
View File

@@ -2,7 +2,7 @@
<div id="accessibile-confirm-modal" class="modal" aria-hidden="true">
<div class="inner-wrapper" role="dialog" aria-labelledby="accessibile-confirm-title">
<button class="close-modal">
<i class="icon-remove"></i>
<i class="icon fa fa-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_('Close')}

2
lms/templates/navigation-edx.html
View File

@@ -89,7 +89,7 @@ site_status_msg = get_site_status_msg(course_id)
<ol class="user">
<li class="primary">
<a class="shopping-cart" href="${reverse('shoppingcart.views.show_cart')}">
<i class="icon-shopping-cart"></i> ${_("Shopping Cart")}
<i class="icon fa fa-shopping-cart"></i> ${_("Shopping Cart")}
</a>
</li>
</ol>

2
lms/templates/navigation.html
View File

@@ -83,7 +83,7 @@ site_status_msg = get_site_status_msg(course_id)
<ol class="user">
<li class="primary">
<a class="shopping-cart" href="${reverse('shoppingcart.views.show_cart')}">
<i class="icon-shopping-cart"></i> ${_("Shopping Cart")}
<i class="icon fa fa-shopping-cart"></i> ${_("Shopping Cart")}
</a>
</li>
</ol>

4
lms/templates/shoppingcart/cybersource_form.html
View File

@@ -3,5 +3,5 @@
<input type="hidden" name="${pk}" value="${pv}" />
% endfor
<i class="icon-caret-right"></i><input type="submit" value="Payment"/>
</form>
<i class="icon fa fa-caret-right"></i><input type="submit" value="Payment"/>
</form>

4
lms/templates/shoppingcart/receipt.html
View File

@@ -29,7 +29,7 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
## in case of multiple courses in single self purchase scenario,
## we will show the button View Dashboard
<% dashboard_url = reverse('dashboard') %>
<a href="${dashboard_url}" class="blue pull-right">${_("View Dashboard")} <i class="icon-caret-right"></i></a>
<a href="${dashboard_url}" class="blue pull-right">${_("View Dashboard")} <i class="icon fa fa-caret-right"></i></a>
<span class="mt-7">
${_(u"You have successfully been enrolled for {course_names}. "
u"The following receipt has been emailed to {receipient_emails}").format(
@@ -94,7 +94,7 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
%endif
<div class="bordered-bar">
<h2>${_('Invoice')} #${order.id}<span>${_('Date of purchase')}: ${order_purchase_date} </span><span
class="pull-right"><a href="" onclick="window.print();" class="blue-link"><i class="icon-print"></i> ${_('Print Receipt')}</a></span>
class="pull-right"><a href="" onclick="window.print();" class="blue-link"><i class="icon fa fa-print"></i> ${_('Print Receipt')}</a></span>
</h2>
</div>
% if order.total_cost > 0:

8
lms/templates/shoppingcart/shopping_cart.html
View File

@@ -65,14 +65,14 @@ from django.utils.translation import ugettext as _
<div class="counter">
<input maxlength="3" title="Input qty and press enter." max="999" type="text" name="students" value="${item.qty}" id="${item.id}" data-unit-cost="${item.unit_cost}" data-qty="${item.qty}">
</div>
<div class="inc button"><i class="icon-caret-up"><span>+</span></i></div><div class="dec button"><i class="icon-caret-down"></i></div>
<div class="inc button"><i class="icon fa fa-caret-up"><span>+</span></i></div><div class="dec button"><i class="icon-caret-down"></i></div>
<!--<a name="updateBtn" class="updateBtn hidden" id="updateBtn-${item.id}" href="#">update</a>-->
<span class="error-text hidden" id="students-${item.id}"></span>
</div>
</div>
<div class="col-3">
<a href="#" class="btn-remove" data-item-id="${item.id}"><i class="icon-remove-sign"></i></a>
<a href="#" class="btn-remove" data-item-id="${item.id}"><i class="icon fa fa-times-circle"></i></a>
</div>
</div>
</div>
@@ -91,7 +91,7 @@ from django.utils.translation import ugettext as _
</div>
% else:
<div class="code-applied">
<span class="green"><i class="icon-ok"></i>${_('code has been applied')}</span>
<span class="green"><i class="icon fa fa-check-square-o"></i>${_('code has been applied')}</span>
<input type="submit" value="Reset" class="blue-border" id="submit-reset-redemption">
</div>
%endif
@@ -102,7 +102,7 @@ from django.utils.translation import ugettext as _
<div class="col-2 relative">
% if order_type == 'business':
<div name="billing">
<input type="submit" value = "Billing Details" name="billing-details"><i class="icon-caret-right"></i>
<input type="submit" value = "Billing Details" name="billing-details"><i class="icon fa fa-caret-right"></i>
<p>
${_('After this purchase is complete, a receipt is generated with relative billing details and registration codes for students.')}
</p>

2
lms/templates/shoppingcart/verified_cert_receipt.html
View File

@@ -65,7 +65,7 @@
<li class="progress-step progress-step-icon" id="progress-step5">
<span class="wrapper-step-number"><span class="step-number">
<i class="icon-ok"></i>
<i class="icon fa fa-check-square-o"></i>
</span></span>
<span class="step-name"><span class="sr">${_("Current Step: ")}</span>${_("Confirmation")}</span>
</li>

2
lms/templates/signup_modal.html
View File

@@ -11,7 +11,7 @@
<section id="signup-modal" class="modal signup-modal">
<div class="inner-wrapper">
<button class="close-modal">
<i class="icon-remove"></i>
<i class="icon fa fa-remove"></i>
<span class="sr">
## Translators: this is a control to allow users to exit out of this modal interface (a menu or piece of UI that takes the full focus of the screen)
${_('Close')}

4
lms/templates/student_profile/third_party_auth.html
View File

@@ -12,9 +12,9 @@
<div class="auth-provider">
<div class="status">
% if state.has_account:
<i class="icon icon-link"></i> <span class="copy">${_('Linked')}</span>
<i class="icon fa fa-link"></i> <span class="copy">${_('Linked')}</span>
% else:
<i class="icon icon-unlink"></i><span class="copy">${_('Not Linked')}</span>
<i class="icon fa fa-unlink"></i><span class="copy">${_('Not Linked')}</span>
% endif
</div>
<span class="provider">${state.provider.NAME}</span>

12
lms/templates/ux/reference/instructor_dashboard/membership.html
View File

@@ -263,7 +263,7 @@
</form>
<a href="" class="action-primary action-create">
<i class="icon-plus"></i>
<i class="icon fa fa-plus"></i>
Add Cohort Group
</a>
</div>
@@ -278,7 +278,7 @@
<div class="message-actions">
<button class="action-primary action-create">
<i class="icon icon-plus"></i>
<i class="icon fa fa-plus"></i>
Add a Cohort Group
</button>
</div>
@@ -315,7 +315,7 @@
<div class="form-actions">
<button class="form-submit button action-primary action-save">
<i class="icon icon-plus"></i>
<i class="icon fa fa-plus"></i>
Save
</button>
<a href="" class="form-cancel action-secondary action-cancel">Cancel</a>
@@ -341,7 +341,7 @@
<div class="form-actions">
<button class="form-submit button action-primary action-save">
<i class="icon icon-plus"></i>
<i class="icon fa fa-plus"></i>
Save
</button>
<a href="" class="form-cancel action-secondary action-cancel">Cancel</a>
@@ -446,7 +446,7 @@
<div class="form-actions">
<button class="form-submit button action-primary action-add">
<i class="button-icon icon icon-plus"></i> Add Students
<i class="button-icon icon fa fa-plus"></i> Add Students
</button>
</div>
</form>
@@ -455,7 +455,7 @@
<!-- cta - view download -->
<div class="cohort-management-supplemental">
<p class=""><i class="icon icon-info-sign"></i> You may view individual student information for each cohort via your entire course profile data download on <a href="" class="link-cross-reference">the data download view</a></p>
<p class=""><i class="icon fa fa-info-sign"></i> You may view individual student information for each cohort via your entire course profile data download on <a href="" class="link-cross-reference">the data download view</a></p>
</div>
</div>
</section>

2
lms/templates/verify_student/_modal_editname.html
View File

@@ -28,7 +28,7 @@
</form>
</div>
<a href="javascript:void(0)" data-dismiss="leanModal" rel="view" class="action action-close action-editname-close close-modal">
<i class="icon-remove-sign"></i>
<i class="icon fa fa-times-circle"></i>
<span class="sr">${_("close")}</span>
</a>
</section>

14
lms/templates/verify_student/face_upload.html
View File

@@ -86,13 +86,13 @@ $(document).ready(function() {
<div class="controls photo-controls">
<ul class="controls-list">
<li class="control control-redo">
<a class="action action-redo" href=""><i class="icon-undo"></i> <span class="sr">Retake</span></a>
<a class="action action-redo" href=""><i class="icon fa fa-undo"></i> <span class="sr">Retake</span></a>
</li>
<li class="control control-do">
<a class="action action-do" href=""><i class="icon-camera"></i> <span class="sr">Take photo</span></a>
<a class="action action-do" href=""><i class="icon fa fa-camera"></i> <span class="sr">Take photo</span></a>
</li>
<li class="control control-approve">
<a class="action action-approve" href=""><i class="icon-ok"></i> <span class="sr">Looks good</span></a>
<a class="action action-approve" href=""><i class="icon fa fa-check-square-o"></i> <span class="sr">Looks good</span></a>
</li>
</ul>
</div>
@@ -150,13 +150,13 @@ $(document).ready(function() {
<div class="controls photo-controls">
<ul class="controls-list">
<li class="control control-redo">
<a class="action action-redo" href=""><i class="icon-undo"></i> <span class="sr">Retake</span></a>
<a class="action action-redo" href=""><i class="icon fa fa-undo"></i> <span class="sr">Retake</span></a>
</li>
<li class="control control-do">
<a class="action action-do" href=""><i class="icon-camera"></i> <span class="sr">Take photo</span></a>
<a class="action action-do" href=""><i class="icon fa fa-camera"></i> <span class="sr">Take photo</span></a>
</li>
<li class="control control-approve">
<a class="action action-approve" href=""><i class="icon-ok"></i> <span class="sr">Looks good</span></a>
<a class="action action-approve" href=""><i class="icon fa fa-check-square-o"></i> <span class="sr">Looks good</span></a>
</li>
</ul>
</div>
@@ -316,7 +316,7 @@ $(document).ready(function() {
</div>
</form>
<a href="#" data-dismiss="modal" rel="view" class="action action-close action-editname-close">
<i class="icon-remove-sign"></i>
<i class="icon fa fa-times-circle"></i>
<span class="label">close</span>
</a>
</section>

16
lms/templates/verify_student/midcourse_photo_reverification.html
View File

@@ -17,7 +17,7 @@
<div id="no-webcam" style="display: none;" class="wrapper-msg wrapper-msg-activate">
<div class=" msg msg-activate">
<i class="msg-icon icon-warning-sign"></i>
<i class="msg-icon fa fa-warning"></i>
<div class="msg-content">
<h3 class="title">${_("No Webcam Detected")}</h3>
<div class="copy">
@@ -29,7 +29,7 @@
<div id="no-flash" style="display: none;" class="wrapper-msg wrapper-msg-activate">
<div class=" msg msg-activate">
<i class="msg-icon icon-warning-sign"></i>
<i class="msg-icon fa fa-warning"></i>
<div class="msg-content">
<h3 class="title">${_("No Flash Detected")}</h3>
<div class="copy">
@@ -42,7 +42,7 @@
%if error:
<div id="submission-error" class="wrapper-msg wrapper-msg-activate">
<div class=" msg msg-activate">
<i class="msg-icon icon-warning-sign"></i>
<i class="msg-icon fa fa-warning"></i>
<div class="msg-content">
<h3 class="title">${_("Error submitting your images")}</h3>
<div class="copy">
@@ -87,19 +87,19 @@
<ul class="list-controls">
<li class="control control-redo" id="face_reset_button">
<a class="action action-redo" href="">
<i class="icon-undo"></i> <span class="sr">${_("Retake")}</span>
<i class="icon fa fa-undo"></i> <span class="sr">${_("Retake")}</span>
</a>
</li>
<li class="control control-do" id="face_capture_button">
<a class="action action-do" href="">
<i class="icon-camera"></i><span class="sr">${_("Take photo")}</span>
<i class="icon fa fa-camera"></i><span class="sr">${_("Take photo")}</span>
</a>
</li>
<li class="control control-approve" id="face_approve_button">
<a class="action action-approve" href="">
<i class="icon-ok"></i> <span class="sr">${_("Looks good")}</span>
<i class="icon fa fa-check-square-o"></i> <span class="sr">${_("Looks good")}</span>
</a>
</li>
</ul>
@@ -115,8 +115,8 @@
<li class="help-item">${_("Make sure your face is well-lit")}</li>
<li class="help-item">${_("Be sure your entire face is inside the frame")}</li>
<li class="help-item">${_("Can we match the photo you took with the one on your ID?")}</li>
<li class="help-item">${_("Once in position, use the camera button")} <span class="example">(<i class="icon-camera"></i>)</span> ${_("to capture your picture")}</li>
<li class="help-item">${_("Use the checkmark button")} <span class="example">(<i class="icon-ok"></i>)</span> ${_("once you are happy with the photo")}</li>
<li class="help-item">${_("Once in position, use the camera button")} <span class="example">(<i class="icon fa fa-camera"></i>)</span> ${_("to capture your picture")}</li>
<li class="help-item">${_("Use the checkmark button")} <span class="example">(<i class="icon fa fa-check-square-o"></i>)</span> ${_("once you are happy with the photo")}</li>
</ul>
</div>
</div>

28
lms/templates/verify_student/photo_reverification.html
View File

@@ -18,7 +18,7 @@
<div id="no-webcam" style="display: none;" class="wrapper-msg wrapper-msg-activate">
<div class=" msg msg-activate">
<i class="msg-icon icon-warning-sign"></i>
<i class="msg-icon fa fa-warning"></i>
<div class="msg-content">
<h3 class="title">${_("No Webcam Detected")}</h3>
<div class="copy">
@@ -30,7 +30,7 @@
<div id="no-flash" style="display: none;" class="wrapper-msg wrapper-msg-activate">
<div class=" msg msg-activate">
<i class="msg-icon icon-warning-sign"></i>
<i class="msg-icon fa fa-warning"></i>
<div class="msg-content">
<h3 class="title">${_("No Flash Detected")}</h3>
<div class="copy">
@@ -43,7 +43,7 @@
%if error:
<div id="submission-error" class="wrapper-msg wrapper-msg-activate">
<div class=" msg msg-activate">
<i class="msg-icon icon-warning-sign"></i>
<i class="msg-icon fa fa-warning"></i>
<div class="msg-content">
<h3 class="title">${_("Error submitting your images")}</h3>
<div class="copy">
@@ -92,7 +92,7 @@
<li class="progress-step progress-step-icon" id="progress-step4">
<span class="wrapper-step-number"><span class="step-number">
<i class="icon-ok"></i>
<i class="icon fa fa-check-square-o"></i>
</span></span>
<span class="step-name">${_("Confirmation")}</span>
</li>
@@ -131,19 +131,19 @@
<ul class="list-controls">
<li class="control control-redo" id="face_reset_button">
<a class="action action-redo" href="">
<i class="icon-undo"></i> <span class="sr">${_("Retake")}</span>
<i class="icon fa fa-undo"></i> <span class="sr">${_("Retake")}</span>
</a>
</li>
<li class="control control-do" id="face_capture_button">
<a class="action action-do" href="">
<i class="icon-camera"></i><span class="sr">${_("Take photo")}</span>
<i class="icon fa fa-camera"></i><span class="sr">${_("Take photo")}</span>
</a>
</li>
<li class="control control-approve" id="face_approve_button">
<a class="action action-approve" href="">
<i class="icon-ok"></i> <span class="sr">${_("Looks good")}</span>
<i class="icon fa fa-check-square-o"></i> <span class="sr">${_("Looks good")}</span>
</a>
</li>
</ul>
@@ -159,8 +159,8 @@
<li class="help-item">${_("Make sure your face is well-lit")}</li>
<li class="help-item">${_("Be sure your entire face is inside the frame")}</li>
<li class="help-item">${_("Can we match the photo you took with the one on your ID?")}</li>
<li class="help-item">${_("Once in position, use the camera button")} <span class="example">(<i class="icon-camera"></i>)</span> ${_("to capture your picture")}</li>
<li class="help-item">${_("Use the checkmark button")} <span class="example">(<i class="icon-ok"></i>)</span> ${_("once you are happy with the photo")}</li>
<li class="help-item">${_("Once in position, use the camera button")} <span class="example">(<i class="icon fa fa-camera"></i>)</span> ${_("to capture your picture")}</li>
<li class="help-item">${_("Use the checkmark button")} <span class="example">(<i class="icon fa fa-check-square-o"></i>)</span> ${_("once you are happy with the photo")}</li>
</ul>
</div>
</div>
@@ -217,19 +217,19 @@
<ul class="list-controls">
<li class="control control-redo" id="photo_id_reset_button">
<a class="action action-redo" href="">
<i class="icon-undo"></i> <span class="sr">${_("Retake")}</span>
<i class="icon fa fa-undo"></i> <span class="sr">${_("Retake")}</span>
</a>
</li>
<li class="control control-do" id="photo_id_capture_button">
<a class="action action-do" href="">
<i class="icon-camera"></i> <span class="sr">${_("Take photo")}</span>
<i class="icon fa fa-camera"></i> <span class="sr">${_("Take photo")}</span>
</a>
</li>
<li class="control control-approve" id="photo_id_approve_button">
<a class="action action-approve" href="">
<i class="icon-ok"></i> <span class="sr">${_("Looks good")}</span>
<i class="icon fa fa-check-square-o"></i> <span class="sr">${_("Looks good")}</span>
</a>
</li>
</ul>
@@ -247,8 +247,8 @@
<li class="help-item">${_("Check that there isn't any glare")}</li>
<li class="help-item">${_("Ensure that you can see your photo and read your name")}</li>
<li class="help-item">${_("Try to keep your fingers at the edge to avoid covering important information")}</li>
<li class="help-item">${_("Once in position, use the camera button")} <span class="example">(<i class="icon-camera"></i>)</span> ${_("to capture your ID")}</li>
<li class="help-item">${_("Use the checkmark button")} <span class="example">(<i class="icon-ok"></i>)</span> ${_("once you are happy with the photo")}</li>
<li class="help-item">${_("Once in position, use the camera button")} <span class="example">(<i class="icon fa fa-camera"></i>)</span> ${_("to capture your ID")}</li>
<li class="help-item">${_("Use the checkmark button")} <span class="example">(<i class="icon fa fa-check-square-o"></i>)</span> ${_("once you are happy with the photo")}</li>
</ul>
</div>
</div>

30
lms/templates/verify_student/photo_verification.html
View File

@@ -23,7 +23,7 @@
<div id="no-webcam" style="display: none;" class="wrapper-msg wrapper-msg-activate">
<div class=" msg msg-activate">
<i class="msg-icon icon-warning-sign"></i>
<i class="msg-icon fa fa-warning"></i>
<div class="msg-content">
<h3 class="title">${_("No Webcam Detected")}</h3>
<div class="copy">
@@ -35,7 +35,7 @@
<div id="no-flash" style="display: none;" class="wrapper-msg wrapper-msg-activate">
<div class=" msg msg-activate">
<i class="msg-icon icon-warning-sign"></i>
<i class="msg-icon fa fa-warning"></i>
<div class="msg-content">
<h3 class="title">${_("No Flash Detected")}</h3>
<div class="copy">
@@ -47,7 +47,7 @@
<div id="order-error" style="display: none;" class="wrapper-msg wrapper-msg-activate">
<div class=" msg msg-activate">
<i class="msg-icon icon-warning-sign"></i>
<i class="msg-icon fa fa-warning"></i>
<div class="msg-content">
<h3 class="title">${_("Error processing your order")}</h3>
<div class="copy">
@@ -59,7 +59,7 @@
<div id="photo-error" style="display: none;" class="wrapper-msg wrapper-msg-activate">
<div class=" msg msg-activate">
<i class="msg-icon icon-warning-sign"></i>
<i class="msg-icon fa fa-warning"></i>
<div class="msg-content">
<h3 class="title">${_("Error processing your order")}</h3>
<div class="copy">
@@ -113,7 +113,7 @@
<li class="progress-step progress-step-icon" id="progress-step5">
<span class="wrapper-step-number"><span class="step-number">
<i class="icon-ok"></i>
<i class="icon fa fa-check-square-o"></i>
</span></span>
<span class="step-name">${_("Confirmation")}</span>
</li>
@@ -152,19 +152,19 @@
<ul class="list-controls">
<li class="control control-redo" id="face_reset_button">
<a class="action action-redo" href="">
<i class="icon-undo"></i> <span class="sr">${_("Retake")}</span>
<i class="icon fa fa-undo"></i> <span class="sr">${_("Retake")}</span>
</a>
</li>
<li class="control control-do" id="face_capture_button">
<a class="action action-do" href="">
<i class="icon-camera"></i><span class="sr">${_("Take photo")}</span>
<i class="icon fa fa-camera"></i><span class="sr">${_("Take photo")}</span>
</a>
</li>
<li class="control control-approve" id="face_approve_button">
<a class="action action-approve" href="">
<i class="icon-ok"></i> <span class="sr">${_("Looks good")}</span>
<i class="icon fa fa-check-square-o"></i> <span class="sr">${_("Looks good")}</span>
</a>
</li>
</ul>
@@ -180,8 +180,8 @@
<li class="help-item">${_("Make sure your face is well-lit")}</li>
<li class="help-item">${_("Be sure your entire face is inside the frame")}</li>
<li class="help-item">${_("Can we match the photo you took with the one on your ID?")}</li>
<li class="help-item">${_("Once in position, use the camera button")} <span class="example">(<i class="icon-camera"></i>)</span> ${_("to capture your picture")}</li>
<li class="help-item">${_("Use the checkmark button")} <span class="example">(<i class="icon-ok"></i>)</span> ${_("once you are happy with the photo")}</li>
<li class="help-item">${_("Once in position, use the camera button")} <span class="example">(<i class="icon fa fa-camera"></i>)</span> ${_("to capture your picture")}</li>
<li class="help-item">${_("Use the checkmark button")} <span class="example">(<i class="icon fa fa-check-square-o"></i>)</span> ${_("once you are happy with the photo")}</li>
</ul>
</div>
</div>
@@ -246,19 +246,19 @@
<ul class="list-controls">
<li class="control control-redo" id="photo_id_reset_button">
<a class="action action-redo" href="">
<i class="icon-undo"></i> <span class="sr">${_("Retake")}</span>
<i class="icon fa fa-undo"></i> <span class="sr">${_("Retake")}</span>
</a>
</li>
<li class="control control-do" id="photo_id_capture_button">
<a class="action action-do" href="">
<i class="icon-camera"></i> <span class="sr">${_("Take photo")}</span>
<i class="icon fa fa-camera"></i> <span class="sr">${_("Take photo")}</span>
</a>
</li>
<li class="control control-approve" id="photo_id_approve_button">
<a class="action action-approve" href="">
<i class="icon-ok"></i> <span class="sr">${_("Looks good")}</span>
<i class="icon fa fa-check-square-o"></i> <span class="sr">${_("Looks good")}</span>
</a>
</li>
</ul>
@@ -276,8 +276,8 @@
<li class="help-item">${_("Ensure that you can see your photo and read your name")}</li>
<li class="help-item">${_("Try to keep your fingers at the edge to avoid covering important information")}</li>
<li class="help-item">${_("Acceptable IDs include drivers licenses, passports, or other goverment-issued IDs that include your name and photo")}</li>
<li class="help-item">${_("Once in position, use the camera button")} <span class="example">(<i class="icon-camera"></i>)</span> ${_("to capture your ID")}</li>
<li class="help-item">${_("Use the checkmark button")} <span class="example">(<i class="icon-ok"></i>)</span> ${_("once you are happy with the photo")}</li>
<li class="help-item">${_("Once in position, use the camera button")} <span class="example">(<i class="icon fa fa-camera"></i>)</span> ${_("to capture your ID")}</li>
<li class="help-item">${_("Use the checkmark button")} <span class="example">(<i class="icon fa fa-check-square-o"></i>)</span> ${_("once you are happy with the photo")}</li>
</ul>
</div>
</div>

2
lms/templates/verify_student/reverification_confirmation.html
View File

@@ -38,7 +38,7 @@
<li class="progress-step is-current progress-step-icon" id="progress-step4">
<span class="wrapper-step-number"><span class="step-number">
<i class="icon-ok"></i>
<i class="icon fa fa-check-square-o"></i>
</span></span>
<span class="step-name"><span class="sr">${_("Current Step: ")}</span>${_("Confirmation")}</span>
</li>

24
lms/templates/verify_student/show_requirements.html
View File

@@ -15,7 +15,7 @@
%if is_not_active:
<div class="wrapper-msg wrapper-msg-activate">
<div class=" msg msg-activate">
<i class="msg-icon icon-warning-sign"></i>
<i class="msg-icon fa fa-warning"></i>
<div class="msg-content">
<h3 class="title">${_("You need to activate your edX account before proceeding")}</h3>
<div class="copy">
@@ -63,7 +63,7 @@
<li class="progress-step progress-step-icon" id="progress-step5">
<span class="wrapper-step-number"><span class="step-number">
<i class="icon-ok"></i>
<i class="icon fa fa-check-square-o"></i>
</span></span>
<span class="step-name">${_("Confirmation")}</span>
</li>
@@ -97,7 +97,7 @@
<li class="req req-0 req-activate">
<h4 class="title">${_("Activate Your Account")}</h4>
<div class="placeholder-art">
<i class="icon-envelope-alt"></i>
<i class="icon fa fa-envelope-o"></i>
</div>
<div class="copy">
@@ -112,8 +112,10 @@
<li class="req req-1 req-id">
<h4 class="title">${_("Identification")}</h4>
<div class="placeholder-art">
<i class="icon-list-alt icon-under"></i>
<i class="icon-user icon-over"></i>
<span class="fa-stack">
<i class="icon fa fa-list-alt fa-stack-2x"></i>
<i class="icon fa fa-user fa-stack-1"></i>
</span>
</div>
<div class="copy">
@@ -127,18 +129,18 @@
<li class="req req-2 req-webcam">
<h4 class="title">${_("Webcam")}</h4>
<div class="placeholder-art">
<i class="icon-facetime-video"></i>
<i class="icon fa fa-facetime-video"></i>
</div>
<div class="copy">
<p>
<span class="copy-super">${_("A webcam and a modern browser")}</span>
<span class="copy-sub"><strong>
<a rel="external" href="https://www.mozilla.org/en-US/firefox/new/">Firefox</a>,
<a rel="external" href="https://www.google.com/intl/en/chrome/browser/">Chrome</a>,
<a rel="external" href="https://www.mozilla.org/en-US/firefox/new/">Firefox</a>,
<a rel="external" href="https://www.google.com/intl/en/chrome/browser/">Chrome</a>,
<a rel="external" href="http://www.apple.com/safari/">Safari</a>,
## Translators: This phrase will look like this: "Internet Explorer 9 or later"
<a rel="external" href="http://windows.microsoft.com/en-us/internet-explorer/download-ie">${_("{internet_explorer_version} or later").format(internet_explorer_version="Internet Explorer 9")}</a></strong>.
## Translators: This phrase will look like this: "Internet Explorer 9 or later"
<a rel="external" href="http://windows.microsoft.com/en-us/internet-explorer/download-ie">${_("{internet_explorer_version} or later").format(internet_explorer_version="Internet Explorer 9")}</a></strong>.
${_("Please make sure your browser is updated to the most recent version possible.")}
</span>
</p>
@@ -148,7 +150,7 @@
<li class="req req-3 req-payment">
<h4 class="title">${_("Credit or Debit Card")}</h4>
<div class="placeholder-art">
<i class="icon-credit-card"></i>
<i class="icon fa fa-credit-card"></i>
</div>
<div class="copy">

2
lms/templates/verify_student/verified.html
View File

@@ -68,7 +68,7 @@ $(document).ready(function() {
<li class="progress-step progress-step-icon" id="progress-step4">
<span class="wrapper-step-number"><span class="step-number">
<i class="icon-ok"></i>
<i class="icon fa fa-check-square-o"></i>
</span></span>
<span class="step-name">${_("Confirmation")}</span>
</li>

4
lms/templates/wiki/create.html
View File

@@ -33,12 +33,12 @@
{% wiki_form create_form %}
<div class="form-actions">
<button type="submit" name="save_changes" class="btn btn-primary btn-large">
<i class="icon-plus"></i>
<i class="icon fa fa-plus"></i>
{% trans "Create article" %}
</button>
<a href="{% url 'wiki:get' path=parent_urlpath.path %}" class="btn btn-large back">
<i class="icon-circle-arrow-left"></i>
<i class="icon fa fa-circle-arrow-left"></i>
{% trans "Go back" %}
</a>
</div>

4
lms/templates/wiki/delete.html
View File

@@ -46,11 +46,11 @@
</script>
<div class="form-actions">
<button type="submit" name="save_changes" class="btn btn-danger btn-large">
<i class="icon-remove"></i>
<i class="icon fa fa-remove"></i>
{% trans "Delete article" %}
</button>
<a href="{% url 'wiki:get' path=urlpath.path article_id=article.id %}" class="btn btn-large back">
<i class="icon-circle-arrow-left"></i>
<i class="icon fa fa-circle-arrow-left"></i>
{% trans "Go back" %}
</a>
</div>

12
lms/templates/wiki/edit.html
View File

@@ -25,7 +25,7 @@
{% include "wiki/includes/editor.html" %}
<div class="form-actions">
<button type="submit" name="save" value="1" class="btn btn-large btn-primary" onclick="this.form.target=''; this.form.action='{% url 'wiki:edit' path=urlpath.path article_id=article.id %}'">
<i class="icon-ok"></i>
<i class="icon fa fa-check-square-o"></i>
{% trans "Save changes" %}
</button>
<a class="btn btn-large" id="previewButton" href="#previewModal" rel="leanModal"
@@ -33,19 +33,19 @@
document.article_edit_form.target='previewWindow';
document.article_edit_form.action='{% url 'wiki:preview' path=urlpath.path article_id=article.id %}';
document.article_edit_form.submit();">
<i class="icon-eye-open"></i>
<i class="icon fa fa-eye"></i>
{% trans "Preview" %}
</a>
<a href="{% url 'wiki:delete' path=urlpath.path article_id=article.id %}" class="pull-right btn btn-danger">
<i class="icon-remove"></i>
<i class="icon fa fa-remove"></i>
{% trans "Delete article" %}
</a>
</div>
<section id="previewModal" class="modal" aria-hidden="true">
<div class="inner-wrapper" role="dialog" aria-labelledby="preview-title">
<button class="close-modal"><i class="icon-remove"></i> <span class="sr">{% trans 'Close' %}</span></button>
<button class="close-modal"><i class="icon fa fa-remove"></i> <span class="sr">{% trans 'Close' %}</span></button>
<header>
<h2 id="preview-title">{% trans "Wiki Preview" %}<span class="sr">, {% trans "window open" %}</span></h2>
@@ -57,12 +57,12 @@
</div>
<div class="modal-footer">
<button type="submit" name="save" value="1" class="btn btn-large btn-primary" onclick="this.form.target=''; this.form.action='{% url 'wiki:edit' path=urlpath.path article_id=article.id %}'">
<i class="icon-ok"></i>
<i class="icon fa fa-check-square-o"></i>
{% trans "Save changes" %}
</button>
<a id="previewModalBackToEditor" href="#" class="btn btn-large">
<i class="icon-circle-arrow-left"></i>
<i class="icon fa fa-circle-arrow-left"></i>
{% trans "Back to editor" %}
</a>
</div>

28
lms/templates/wiki/history.html
View File

@@ -102,7 +102,7 @@
<div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle" style="float: left;" href="{% url 'wiki:diff' revision.id %}">
<i class="icon-plus"></i>
<i class="icon fa fa-plus"></i>
{% include "wiki/includes/revision_info.html" with current_revision=article.current_revision %}
<div style="color: #CCC;">
<small>
@@ -130,7 +130,7 @@
document.revisions_form.action='{% url 'wiki:preview_revision' article.id %}';
$('#previewRevisionModal .switch-to-revision').attr('href', '{% url 'wiki:change_revision' path=urlpath.path article_id=article.id revision_id=revision.id %}');
document.revisions_form.submit();">
<i class="icon-eye-open"></i>
<i class="icon fa fa-eye"></i>
{% trans "Preview this revision" %}
</a>
@@ -180,17 +180,17 @@
document.revisions_form.action=$('input[type=radio]:checked').attr('merge-button-href');
$('.merge-revision-commit').attr('href', $('input[type=radio]:checked').attr('merge-button-commit-href'));
document.revisions_form.submit();">
<i class="icon-random"></i>
<i class="icon fa fa-random"></i>
{% trans "Merge selected with current..." %}
</a>
{% else %}
<button type="submit" disabled="true" name="preview" value="1" class="btn btn-large">
<i class="icon-lock"></i>
<i class="icon fa fa-lock"></i>
{% trans "Merge selected with current..." %}
</button>
{% endif %}
<button type="submit" name="save" value="1" class="btn btn-large btn-primary" onclick="this.form.action=$('input[type=radio]:checked').attr('switch-button-href')">
<i class="icon-flag"></i>
<i class="icon fa fa-flag"></i>
{% trans "Switch to selected version" %}
</button>
</div>
@@ -201,7 +201,7 @@
<input type="hidden" name="r" value="" />
<section id="previewRevisionModal" class="modal" aria-hidden="true">
<div class="inner-wrapper" role="dialog" aria-labelledby="preview-title">
<button class="close-modal"><i class="icon-remove"></i> <span class="sr">{% trans 'Close' %}</span></button>
<button class="close-modal"><i class="icon fa fa-remove"></i> <span class="sr">{% trans 'Close' %}</span></button>
<header>
<h2 id="preview-title">{% trans "Wiki Revision Preview" %}<span class="sr">, {% trans "window open" %}</span></h2>
@@ -212,17 +212,17 @@
</div>
<div class="modal-footer">
<a id="previewRevisionModalBackToHistory" href="#" class="btn btn-large" data-dismiss="modal">
<i class="icon-circle-arrow-left"></i>
<i class="icon fa fa-circle-arrow-left"></i>
{% trans "Back to history view" %}
</a>
{% if article|can_write:user %}
<a href="#" class="btn btn-large btn-primary switch-to-revision">
<i class="icon-flag"></i>
<i class="icon fa fa-flag"></i>
{% trans "Switch to this version" %}
</a>
{% else %}
<a href="#" class="btn btn-large btn-primary disabled">
<i class="icon-lock"></i>
<i class="icon fa fa-lock"></i>
{% trans "Switch to this version" %}
</a>
{% endif %}
@@ -232,7 +232,7 @@
<section id="mergeModal" class="modal" aria-hidden="true">
<div class="inner-wrapper" role="dialog" aria-labelledby="merge-title">
<button class="close-modal"><i class="icon-remove"></i> <span class="sr">{% trans 'Close' %}</span></button>
<button class="close-modal"><i class="icon fa fa-remove"></i> <span class="sr">{% trans 'Close' %}</span></button>
<header>
<h2 id="merge-title">{% trans "Merge Revision" %}<span class="sr">, {% trans "window open" %}</span></h2>
@@ -240,24 +240,24 @@
</header>
<div class="modal-header">
<h1>{% trans "Merge with current" %}</h1>
<p class="lead"><i class="icon-info-sign"></i> {% trans "When you merge a revision with the current, all data will be retained from both versions and merged at its approximate location from each revision." %} <strong>{% trans "After this, it's important to do a manual review." %}</strong></p>
<p class="lead"><i class="icon fa fa-info-sign"></i> {% trans "When you merge a revision with the current, all data will be retained from both versions and merged at its approximate location from each revision." %} <strong>{% trans "After this, it's important to do a manual review." %}</strong></p>
</div>
<div class="modal-body">
<iframe name="mergeWindow"></iframe>
</div>
<div class="modal-footer">
<a id="mergeModalBackToHistory" href="#" class="btn btn-large" data-dismiss="modal">
<i class="icon-circle-arrow-left"></i>
<i class="icon fa fa-circle-arrow-left"></i>
{% trans "Back to history view" %}
</a>
{% if article|can_write:user %}
<a href="#" class="btn btn-large btn-primary merge-revision-commit">
<i class="icon-file"></i>
<i class="icon fa fa-file"></i>
{% trans "Create new merged version" %}
</a>
{% else %}
<a href="#" class="btn btn-large btn-primary disabled">
<i class="icon-lock"></i>
<i class="icon fa fa-lock"></i>
{% trans "Create new merged version" %}
</a>
{% endif %}

10
lms/templates/wiki/includes/article_menu.html
View File

@@ -7,7 +7,7 @@
<li class="${"active" if selected_tab == "view" else ""}">
<a href="${reverse('wiki:get', kwargs={'article_id' : article.id, 'path' : urlpath.path})}">
<i class="icon-eye-open"></i>
<i class="icon fa fa-eye"></i>
${_("View")}
${_("{span_start}(active){span_end}").format(span_start="<span class='sr'>", span_end="</span>") if selected_tab == "view" else ""}
</a>
@@ -16,7 +16,7 @@
%if article.can_write(user):
<li class="${"active" if selected_tab == "edit" else ""}">
<a href="${reverse('wiki:edit', kwargs={'article_id' : article.id, 'path' : urlpath.path})}">
<i class="icon-pencil"></i>
<i class="icon fa fa-pencil"></i>
${_("Edit")}
${_("{span_start}(active){span_end}").format(span_start="<span class='sr'>", span_end="</span>") if selected_tab == "edit" else ""}
</a>
@@ -25,7 +25,7 @@
<li class="${"active" if selected_tab == "history" else ""}">
<a href="${reverse('wiki:history', kwargs={'article_id' : article.id, 'path' : urlpath.path})}">
<i class="icon-time"></i>
<i class="icon fa fa-clock-o"></i>
${_("Changes")}
${_("{span_start}(active){span_end}").format(span_start="<span class='sr'>", span_end="</span>") if selected_tab == "history" else ""}
</a>
@@ -35,7 +35,7 @@
%if hasattr(plugin, "article_tab"):
<li class="${"active" if selected_tab == plugin.slug else ""}">
<a href="${reverse('wiki:plugin', kwargs={'slug' : plugin.slug, 'article_id' : article.id, 'path' : urlpath.path}) }">
<i class="icon-file ${plugin.article_tab[1]}"></i>
<i class="icon fa fa-file ${plugin.article_tab[1]}"></i>
${plugin.article_tab[0]}
${_("{span_start}(active){span_end}").format(span_start="<span class='sr'>", span_end="</span>") if selected_tab == plugin.slug else ""}
</a>
@@ -51,7 +51,7 @@ ${_("This should be enabled for all non-anonymous users once the notifications a
%if can_change_permissions(article,user):
<li class="${"active" if selected_tab == "settings" else ""}">
<a href="${reverse('wiki:settings', kwargs={'article_id' : article.id, 'path' : urlpath.path})}">
<i class="icon-cog"></i>
<i class="icon fa fa-cog"></i>
${_("Settings")}
${_("{span_start}active{span_end}").format(span_start="<span class='sr'>(", span_end=")</span>") if selected_tab == "settings" else ""}
</a>

2
lms/templates/wiki/includes/breadcrumbs.html
View File

@@ -31,7 +31,7 @@
</form> -->
%if create_article_root:
<a class="add-article-btn btn pull-left" href="${reverse('wiki:create', kwargs={'path' : create_article_root.path})}" style="padding: 7px;">
<i class="icon-plus"></i>
<i class="icon fa fa-plus"></i>
${_("Add article")}
</a>
%endif

2
lms/templates/wiki/includes/cheatsheet.html
View File

@@ -1,7 +1,7 @@
{% load i18n %}
<section id="cheatsheetModal" class="modal" aria-hidden="true">
<div class="inner-wrapper" role="dialog" aria-labelledby="cheatsheet-title">
<button class="close-modal"><i class="icon-remove"></i> <span class="sr">{% trans 'Close' %}</span></button>
<button class="close-modal"><i class="icon fa fa-remove"></i> <span class="sr">{% trans 'Close' %}</span></button>
<header>
<h2 id="cheatsheet-title">{% trans "Wiki Cheatsheet" %}<span class="sr">, {% trans "window open" %}</span></h2>

20
lms/templates/wiki/plugins/attachments/index.html
View File

@@ -11,17 +11,17 @@
<div class="attachment-options">
<a class="btn" href="#" id="upload-file-btn">
<span class="icon-upload"></span>{% trans "Upload new file" %}
<span class="icon fa fa-arrow-circle-o-up"></span>{% trans "Upload new file" %}
</a>
<a class="btn" href="#" id="search-for-file-btn">
<span class="icon-plus-sign"></span>{% trans "Search and add file" %}
<span class="icon fa fa-plus-sign"></span>{% trans "Search and add file" %}
</a>
</div>
<div class="modal upload-modal hide fade" id="upload-modal">
<div class="modal-inner-wrapper">
<h4>{% trans "Upload File" %}</h4>
<form method="POST" class="form-vertical" id="attachment_form" enctype="multipart/form-data">
<form method="POST" class="form-vertical" id="attachment_form" enctype="multipart/form-data">
{% wiki_form form %}
<button type="submit" name="save" value="1" class="btn btn-primary">
{% trans "Upload file" %}
@@ -56,7 +56,7 @@
$('#search-file-modal').modal('show');
});
</script>
{% endif %}
@@ -95,7 +95,7 @@
{% endif %}
<a href="{% url 'wiki:attachments_replace' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn">{% trans "Replace" %}</a>
{% else %}
{% if attachment.current_revision.previous_revision.id %}
<form method="POST" action="{% url 'wiki:attachments_revision_change' path=urlpath.path article_id=article.id attachment_id=attachment.id revision_id=attachment.current_revision.previous_revision.id %}">
@@ -106,7 +106,7 @@
</form>
{% endif %}
{% endif %}
{% endif %}
{% endif %}
</td>
</tr>
<tr>
@@ -118,7 +118,7 @@
<td>
<a href="{% url 'wiki:attachments_history' path=urlpath.path article_id=article.id attachment_id=attachment.id %}">
<span class="icon-time"></span>
<span class="icon fa fa-clock-o"></span>
{% trans "File history" %} ({{ attachment.attachmentrevision_set.all.count }} {% trans "revisions" %})
</a>
</td>
@@ -131,9 +131,9 @@
{% endfor %}
</ul>
</div>
</div>
{% endblock %}