Skip to content

Commit

Permalink
Merge branch 'master' of github.com:LearnNavi/Naranawm
Browse files Browse the repository at this point in the history
Signed-off-by: Zoe Snow <zoe@snowyfox.com>

# Conflicts:
#	.idea/workspace.xml
  • Loading branch information
snowyfox committed Jan 16, 2018
2 parents bf58a77 + 4c95155 commit 996a0db
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 0 deletions.
7 changes: 7 additions & 0 deletions www/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@
<a class="navbar-brand" href="#">Naranawm</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li class="active"><a href="#">Link <span class="sr-only">(current)</span></a></li>
<li><a href="#!/vezeyko/nav/languages">Languages</a></li>
<li><a href="#!/vezeyko/nav/sources">Sources</a></li>
<li><a href="#!/vezeyko/nav/lemmas">Lemmas</a></li>
</ul>
<form class="navbar-form navbar-right" ng-controller="LoginCtrl" ng-submit="login()" ng-show="showLoginForm()">
<div class="form-group">
<input type="text" placeholder="Username" class="form-control" ng-model="form.username">
Expand Down Expand Up @@ -77,6 +83,7 @@
<script src="vezeyko/vezeyko.js"></script>
<script src="vezeyko/dashboard.js"></script>
<script src="vezeyko/languages.js"></script>
<script src="vezeyko/lemmas.js"></script>
<script src="vezeyko/sources.js"></script>

<script src="components/version/version.js"></script>
Expand Down
29 changes: 29 additions & 0 deletions www/vezeyko/lemmas.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<div class="page-header">
<h1>Lemmas</h1>
</div>
<div class="col-md-12">
<table class="table table-striped">
<thead>
<tr>
<th>ID</th>
<th>PubID</th>
<th>Lemma</th>
<th>IPA</th>
<th>Audio</th>
<th>Rejected</th>
<th>Legacy</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="row in lemmas">
<td>{{ row.id }}</td>
<td>{{ row.pubId }}</td>
<td>{{ row.lemma }}</td>
<td>{{ row.ipa }}</td>
<td><a href="http://temp.learnnavi.org/audio/{{ row.audio }}" onclick="window.open(this.href,this.target,'width=550px,height=350px');return false">{{ row.audio }}</a></td>
<td><input type="checkbox" ng-checked="row.rejected" disabled="true"/></td>
<td><input type="checkbox" ng-checked="row.legacyLemma" disabled="true"/></td>
</tr>
</tbody>
</table>
</div>
8 changes: 8 additions & 0 deletions www/vezeyko/lemmas.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
'use strict';

angular.module('naranawm.vezeyko')
.controller('LemmasCtrl', ["$scope", "Models", function($scope, Models) {
$scope.lemmas = Models.query({model: "Lemma"}, function() {

}); //query() returns all the entries
}]);
5 changes: 5 additions & 0 deletions www/vezeyko/vezeyko.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ angular.module('naranawm.vezeyko', ['ngRoute'])
controller: 'LanguagesCtrl'
});

$routeProvider.when('/vezeyko/:language/lemmas', {
templateUrl: 'vezeyko/lemmas.html',
controller: 'LemmasCtrl'
});

$routeProvider.when('/vezeyko/:language/sources', {
templateUrl: 'vezeyko/sources.html',
controller: 'SourcesCtrl'
Expand Down

0 comments on commit 996a0db

Please sign in to comment.