Skip to content

Commit

Permalink
Modify html indent function (oppia#5171)
Browse files Browse the repository at this point in the history
* Modify check

* Fix indent and placing errors

* Remove trailing spaces

* Modify echo statements in install_third_party.sh

* Adjust tags and text

* Correct text indent

* Adjust text
  • Loading branch information
apb7 authored Jul 3, 2018
1 parent 267d731 commit c8e51c6
Show file tree
Hide file tree
Showing 71 changed files with 486 additions and 289 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@
tabindex="-1" focus-on="<[labelForErrorFocusTarget]>">
<span ng-if="floatForm.floatValue.$error.isFloat && floatForm.floatValue.$viewValue" class="oppia-form-error" aria-live="assertive" translate="I18N_FORMS_TYPE_NUMBER_INVALID_DECIMAL"></span>
<span ng-if="!floatForm.floatValue.$error.isFloat && floatForm.floatValue.$error.isAtLeast"
class="oppia-form-error" aria-live="assertive" translate="I18N_FORMS_TYPE_NUMBER_AT_LEAST" translate-values="{minValue: <[minValue]>}"></span>
class="oppia-form-error" aria-live="assertive" translate="I18N_FORMS_TYPE_NUMBER_AT_LEAST" translate-values="{minValue: <[minValue]>}">
</span>
<span ng-if="!floatForm.floatValue.$error.isFloat && floatForm.floatValue.$error.isAtMost"
class="oppia-form-error" aria-live="assertive" translate="I18N_FORMS_TYPE_NUMBER_AT_MOST" translate-values="{maxValue: <[maxValue]>}"></span>
class="oppia-form-error" aria-live="assertive" translate="I18N_FORMS_TYPE_NUMBER_AT_MOST" translate-values="{maxValue: <[maxValue]>}">
</span>
</span>
</span>
</span>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<table class="table">
<tr ng-repeat="item in localValue track by $index">
<td>
<schema-based-viewer schema="itemSchema()" local-value="localValue[$index]">
</schema-based-viewer>
</td>
</tr>
<tr ng-repeat="item in localValue track by $index">
<td>
<schema-based-viewer schema="itemSchema()" local-value="localValue[$index]">
</schema-based-viewer>
</td>
</tr>
</table>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<a ng-if="isUsernameLinkable(username())" ng-href="/profile/<[username()]>">
<img ng-src="<[profilePicture]>" alt="User Avatar" class="img-circle">
<img ng-src="<[profilePicture]>" alt="User Avatar" class="img-circle">
</a>

<img ng-if="!isUsernameLinkable(username())" ng-src="<[profilePicture]>" alt="">
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<a ng-if="isLinkAvailable()" ng-href="<[link()]>">
<img ng-src="<[src()]>" alt="" class="img-circle">
<img ng-src="<[src()]>" alt="" class="img-circle">
</a>

<img ng-if="!isLinkAvailable()" class="img-circle" ng-src="<[src()]>">
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ <h3 class="activity-title protractor-test-collection-summary-tile-title" ng-styl
</ul>
</div>
<div ng-if="!isPlaylistTile()" class="title-section-mask"
ng-mouseenter="setHoverState(true)" ng-mouseleave="setHoverState(false)"></div>
ng-mouseenter="setHoverState(true)" ng-mouseleave="setHoverState(false)">
</div>
</a>
</md-card>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
ng-mouseenter="setHoverState(true)" ng-mouseleave="setHoverState(false)"
aria-hidden="true"
uib-tooltip="<['I18N_LIBRARY_ADD_TO_LEARNER_PLAYLIST' | translate]>"
tooltip-placement="left"></i>
tooltip-placement="left">
</i>
<div ng-show="canActivityBeAddedToLearnerPlaylist(getActivityId()) && isContainerNarrow()" class="btn-group dropdown oppia-learner-dashboard-icon" uib-dropdown>
<ul style="left:-150px;top:0" class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="single-button">
<li role="menuitem" ng-click="addToLearnerPlaylist(getActivityId(), getActivityType())">
Expand All @@ -21,19 +22,22 @@
tooltip-enable="<[playlistTooltipIsEnabled]>"
ng-mouseleave="enablePlaylistTooltip()"
uib-tooltip="<['I18N_LIBRARY_ACTIVITY_IN_LEARNER_PLAYLIST' | translate]>"
tooltip-placement="left"></i>
tooltip-placement="left">
</i>
<i class="oppia-learner-dashboard-icon fa fa-check-circle-o"
ng-if="belongsToCompletedActivities()"
aria-hidden="true"
uib-tooltip="<['I18N_LIBRARY_ACTIVITY_COMPLETED_ICON' | translate]>"
tooltip-placement="left"></i>
tooltip-placement="left">
</i>
<i class="oppia-learner-dashboard-icon fa fa-spinner"
ng-if="belongsToIncompleteActivities()"
aria-hidden="true"
tooltip-append-to-body="true"
tooltip-class="library-incomplete-activity-tooltip"
uib-tooltip="<['I18N_LIBRARY_INCOMPLETE_ACTIVITY_ICON' | translate]>"
tooltip-placement="left"></i>
tooltip-placement="left">
</i>
<style>
.library-incomplete-activity-tooltip .tooltip-inner {
max-width: none;
Expand Down
7 changes: 5 additions & 2 deletions core/templates/dev/head/pages/about/about.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{% extends 'pages/base.html' %}

{% block maintitle %}I18N_ABOUT_PAGE_TITLE{% endblock maintitle %}
{% block maintitle %}
I18N_ABOUT_PAGE_TITLE
{% endblock maintitle %}

{% block header_js %}
{{ super() }}
Expand Down Expand Up @@ -227,7 +229,8 @@ <h2 translate="I18N_ABOUT_PAGE_CREDITS_TAB_HEADING"></h2>
<li>Ian Luttrell</li>
<li>Ishan Singh</li>
</ul>
<br><br>
<br>
<br>

<span>J</span>
<ul>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@
<li>
<a ng-click="onMouseoutProfilePictureOrDropdown($event)"
href="/preferences"
style="color: #00376d">Preferences</a>
style="color: #00376d">
Preferences
</a>
</li>

<li ng-if="isModerator()">
Expand All @@ -104,7 +106,9 @@
<li>
<a ng-click="onMouseoutProfilePictureOrDropdown($event)"
ng-href="<[getLogoutUrl()]>"
style="color: #00376d">Logout</a>
style="color: #00376d">
Logout
</a>
</li>
</ul>
</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ <h3>Extract Data</h3>
<div class="oppia-query-form">
<form class="form" ng-submit="submitQuery()">
Exploration ID: <input type="text" ng-model="expId" required="true">
<br/>
<br>
Exploration version: <input type="number" min="0" ng-model="expVersion" required="true">
<br/>
<br>
State name: <input type="text" ng-model="stateName" required="true">
<br/>
<br>
Number of answers: <input type="number" min="0" ng-model="numAnswers" required="true">
<br/>
<br>
<input type="submit" value="submit query">
<input type="reset" value="reset"">
<input type="reset" value="reset">
</form>
<br/>
<br>
<p> (To get all answers set number of answers to 0) </p>
<p ng-if="showDataExtractionQueryStatus">Status: <[dataExtractionQueryStatusMessage]></p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@
<div class="col-md-4">
<md-card class="oppia-page-card oppia-long-text" style="">
<legend class="text-center">Role Hierarchy</legend>
<role-graph graph-data="graphData"
graph-data-loaded="graphDataLoaded">
</role-graph>
<role-graph graph-data="graphData"
graph-data-loaded="graphDataLoaded">
</role-graph>
</md-card>
</div>
</div>
Expand Down
16 changes: 10 additions & 6 deletions core/templates/dev/head/pages/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@
</div>
</div>
<div ng-show="!loadingMessage">
{% block content %}{% endblock %}
{% block footer %}{% endblock %}
{% block content %}
{% endblock %}
{% block footer %}
{% endblock %}
</div>
</div>
{%- endmacro %}
Expand Down Expand Up @@ -66,7 +68,8 @@
the page title because the head of the file is outside the scope of
any other controller. -->
<title itemprop="name" translate="{% block maintitle %}Oppia{% endblock maintitle %}"></title>
{% block base_url %}{% endblock base_url %}
{% block base_url %}
{% endblock base_url %}

{% block header_css %}
{% include 'pages/header_css_libs.html' %}
Expand Down Expand Up @@ -164,7 +167,9 @@ <h2>
<i class="material-icons">&#xE811;</i>
</h2>
<p translate="I18N_SPLASH_JAVASCRIPT_ERROR_DESCRIPTION"
translate-values="{hrefUrl: 'http://www.enable-javascript.com/'}">Oppia is a free, open-source learning platform full of interactive activities called 'explorations'. Sadly, Oppia requires JavaScript to be enabled in your web browser in order to function properly and your web browser has JavaScript disabled. If you need help enabling JavaScript, <a href="http://www.enable-javascript.com"/>click here.</a></p>
translate-values="{hrefUrl: 'http://www.enable-javascript.com/'}">
Oppia is a free, open-source learning platform full of interactive activities called 'explorations'. Sadly, Oppia requires JavaScript to be enabled in your web browser in order to function properly and your web browser has JavaScript disabled. If you need help enabling JavaScript, <a href="http://www.enable-javascript.com">click here.</a>
</p>
<p translate="I18N_SPLASH_JAVASCRIPT_ERROR_THANKS">Thank you.</p>
</div>
</div>
Expand All @@ -182,8 +187,7 @@ <h2>
<a ng-if="siteFeedbackFormUrl" ng-href="<[siteFeedbackFormUrl]>" target="_blank"
class="oppia-site-feedback oppia-transition-200">
<i class="material-icons md-18">&#xE87F;</i>
<span translate="I18N_SPLASH_SITE_FEEDBACK"></span>
</i>
<span translate="I18N_SPLASH_SITE_FEEDBACK"></span>
</a>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@
<span ng-if="!isSaveInProgress()">
<span ng-if="collectionRights.isPrivate()">
<i class="material-icons md-18 md-dark oppia-save-publish-button-icon"
alt="Save Collection">&#xE161;</i>
alt="Save Collection">
&#xE161;
</i>
<span class="oppia-save-publish-button-label">Save Draft</span>
<span class="hidden-sm hidden-xs" style="opacity: 0.5"
ng-if="getChangeListCount() > 0">
Expand All @@ -54,7 +56,9 @@
</span>
<span ng-if="collectionRights.isPublic()" title="Publish Changes">
<i class="material-icons md-18 md-dark oppia-save-publish-button-icon"
alt="Publish Changes">&#xE2C3;</i>
alt="Publish Changes">
&#xE2C3;
</i>
<span class="oppia-save-publish-button-label">Publish Changes</span>
</span>
</span>
Expand All @@ -72,7 +76,9 @@
ng-click="publishCollection()"
ng-disabled="!isCollectionPublishable()">
<i class="material-icons md-18 md-dark oppia-save-publish-button-icon"
alt="Publish to Oppia Library">&#xE2C3;</i>
alt="Publish to Oppia Library">
&#xE2C3;
</i>
<span class="oppia-save-publish-button-label">Publish</span>
</button>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</div>

<collection-node-creator></collection-node-creator>
</div>
</md-card>
</div>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ <h2 ng-if="collectionPlaythrough.hasFinishedCollection()" class="oppia-page-head
height="100"
width="100"
ng-attr-xlink:href="<[getStaticImageUrl('/general/collection_start_here_arrow.svg')]>"
xlink:href=""></image>
xlink:href="">
</image>
<text ng-if="!collectionPlaythrough.hasStartedCollection()"
x="210"
y="170"
Expand All @@ -156,7 +157,8 @@ <h2 ng-if="collectionPlaythrough.hasFinishedCollection()" class="oppia-page-head
font-size="15"
fill="#E14738"
text-anchor="middle"
translate="I18N_START_HERE"></text>
translate="I18N_START_HERE">
</text>
</svg>

<img ng-src="<[getStaticImageUrl('/general/collection_mascot.svg')]>" class="collection-mascot">
Expand All @@ -181,14 +183,16 @@ <h2 ng-if="collectionPlaythrough.hasFinishedCollection()" class="oppia-page-head
height="100"
width="100"
ng-attr-xlink:href="<[getStaticImageUrl('/general/collection_paw.svg')]>"
xlink:href=""></image>
xlink:href="">
</image>
<image ng-if="!isCompletedExploration(node.getExplorationId())"
x="10"
y="30"
height="80"
width="80"
ng-attr-xlink:href="<[getStaticImageUrl(pathIconParameters[$index].thumbnailIconUrl)]>"
xlink:href=""></image>
xlink:href="">
</image>
</pattern>
</defs>
<a xlink:href="<[getExplorationUrl(node.getExplorationId())]>"
Expand Down Expand Up @@ -248,7 +252,8 @@ <h2 ng-if="collectionPlaythrough.hasFinishedCollection()" class="oppia-page-head
height="80"
width="100"
ng-attr-xlink:href="<[getStaticImageUrl('/general/collection_start_here_arrow.svg')]>"
xlink:href=""></image>
xlink:href="">
</image>
<text ng-if="!collectionPlaythrough.hasStartedCollection() && $index===0"
x="50"
y="140"
Expand All @@ -257,7 +262,8 @@ <h2 ng-if="collectionPlaythrough.hasFinishedCollection()" class="oppia-page-head
font-size="11"
fill="#E14738"
text-anchor="middle"
translate="I18N_START_HERE"></text>
translate="I18N_START_HERE">
</text>
<defs>
<pattern id="image0<[$index]>" patternUnits="userSpaceOnUse" height="150" width="100">
<circle cx="50"
Expand All @@ -270,14 +276,16 @@ <h2 ng-if="collectionPlaythrough.hasFinishedCollection()" class="oppia-page-head
height="100"
width="100"
ng-attr-xlink:href="<[getStaticImageUrl('/general/collection_paw.svg')]>"
xlink:href=""></image>
xlink:href="">
</image>
<image ng-if="!isCompletedExploration(node.getExplorationId())"
x="10"
y="30"
height="80"
width="80"
ng-attr-xlink:href="<[getStaticImageUrl(pathIconParameters[$index].thumbnailIconUrl)]>"
xlink:href=""></image>
xlink:href="">
</image>
</pattern>
</defs>
<circle ng-show="node.getExplorationId() === nextExplorationId &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,14 @@ <h2 class="oppia-dashboard-title" translate="I18N_DASHBOARD_CREATOR_DASHBOARD"><
<md-card layout="row"
class="oppia-dashboard-list-view-item">
<table class="oppia-dashboard-table">
<colgroup>
<col style="width: 26%;">
<col style="width: 13%;">
<col style="width: 13%;">
<col style="width: 16%;">
<col style="width: 16%;">
<col style="width: 16%;">
</colgroup>
<colgroup>
<col style="width: 26%;">
<col style="width: 13%;">
<col style="width: 13%;">
<col style="width: 16%;">
<col style="width: 16%;">
<col style="width: 16%;">
</colgroup>
<tr>
<th ng-repeat="(key, value) in EXPLORATIONS_SORT_BY_KEYS"
class="oppia-dashboard-table-headings"
Expand Down Expand Up @@ -230,7 +230,8 @@ <h2 class="activity-title protractor-test-exp-summary-tile-title">
</a>
<div ng-attr-section="'<['right-section']>">
<a ng-class="checkMobileView() ? 'oppia-dashboard-mobile-statistics-card-link': 'oppia-dashboard-statistics-card-link'"
ng-href="<[getExplorationUrl(exploration.id)]>"></a>
ng-href="<[getExplorationUrl(exploration.id)]>">
</a>
<div class="exp-private-text" ng-if="exploration.status === 'private'">
<[publishText]>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ <h3>Upload an Exploration</h3>
This form allows you to upload the YAML file corresponding to an exploration. However, you will need to manually upload any additional image files separately.
</p>

<br><br>
<br>
<br>

<p>
<form role="form" class="form-horizontal">
Expand Down
3 changes: 2 additions & 1 deletion core/templates/dev/head/pages/donate/donate.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ <h1 class="oppia-donate-h1">Donate to <br>
<a ng-click="onDonateThroughAmazon()" class="btn oppia-donate-options-button" tabindex="0">Amazon Smile</a>
</div>
<h2 style="color: #fff; font-size: 20px; margin-bottom: 20px; margin-top: 20px;">
Your generous gift funds:</h2>
Your generous gift funds:
</h2>
<div style="margin-bottom: 16px; text-align: center;">
<img ng-src="<[donateImgUrl]>" alt="Server costs, student outreach, marketing">
</div>
Expand Down
Loading

0 comments on commit c8e51c6

Please sign in to comment.