Skip to content

move templates into partials directory #6

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

move templates into partials directory #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 0 additions & 61 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,66 +12,5 @@
<meta charset="utf-8">
</head>
<body ng-view>
<script type="text/ng-template" id="loginView">
<div class="container login-screen" id="loginView" ng-controller="loginCtrl">

<div class="login-icon">
<img src="images/icon.png" alt="Welcome to Freader">
<h4>Welcome to <small>Freader</small></h4>
</div>
<form ng-submit="action()" class="login-form" name="actionForm">
<p class="errorMsg">{{errorMsg}}</p>
<div class="control-group">
<input type="email" class="login-field" id="login-name" placeholder="Email" ng-model="email" required>
<label class="login-field-icon fui-user" for="login-name"></label>
</div>
<div class="control-group">
<input type="password" class="login-field" id="login-pass" placeholder="Password" ng-model="password" required>
<label class="login-field-icon fui-lock" for="login-pass"></label>
</div>
<input type="submit" value="{{text.action}}" ng-disabled="actionForm.$invalid" class="btn btn-primary btn-large btn-block">
<a ng-click="changeAction()" class="actionChange">{{text.changeAction}}</a>
</form>

</div>
</script>


<script type="text/ng-template" id="feedsView">
<div class="container">
<header>
<h1>Freader</h1>
<div class="actions">
<form ng-submit="addFeed()" class="feedAddForm">
<input class="feedAddInput" type="url" ng-class="{active: showNewFeed}" ng-model="newFeedUrl" required placeholder="Feed URL">
<span class="addError" ng-class="{active: addErrorText && showNewFeed}">{{addErrorText}}</span>
</form
><span class="headerAction actionAdd" ng-class="{active: showNewFeed}" ng-click="(!showNewFeed || addFeed()) && (showNewFeed = true)">
<i class="icon-plus"></i>
</span
><span class="headerAction actionDisconnect" ng-click="disconnect()"><i class="icon-off"></i></span>
<div class="overlay" ng-click="showNewFeed = false" ng-class="{active: showNewFeed}"></div>
</div>
</header>

<div class="feeds">
<div class="feed" ng-repeat="feed in feeds">
<p class="title">{{feed.name}}</p>
<p class="description">{{feed.description}}</p>
<div class="articles" ng-class="{active: feed.showArticles}">
<p class="article" ng-repeat="article in feed.items"><a href="{{article.link}}" target="_blank">{{article.title}}</a></p>
</div>
<span class="showArticlesButton" ng-click="feed.showArticles = !feed.showArticles"><i ng-class="{'icon-arrow-down': !feed.showArticles, 'icon-arrow-up': feed.showArticles}"></i></span>
<span class="deleteButton" ng-click="feed.deletePopup = true"><i class="icon-remove"></i></span>
<div class="overlay" ng-click="feed.deletePopup = false" ng-class="{active: feed.deletePopup}"></div>
<div class="deletePopup" ng-class="{active: feed.deletePopup}">
<p>Do you really want to delete this feed ?</p>
<a class="btn btn-danger btnDeletePopup" ng-click="deleteFeed(feed)">Yes</a><a class="btn btnDeletePopup" ng-click="feed.deletePopup = false">No</a>
</div>
</div>
</div>
</div>
</script>

</body>
</html>
33 changes: 33 additions & 0 deletions webapp/partials/feedsView.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<div class="container">
<header>
<h1>Freader</h1>
<div class="actions">
<form ng-submit="addFeed()" class="feedAddForm">
<input class="feedAddInput" type="url" ng-class="{active: showNewFeed}" ng-model="newFeedUrl" required placeholder="Feed URL">
<span class="addError" ng-class="{active: addErrorText && showNewFeed}">{{addErrorText}}</span>
</form
><span class="headerAction actionAdd" ng-class="{active: showNewFeed}" ng-click="(!showNewFeed || addFeed()) && (showNewFeed = true)">
<i class="icon-plus"></i>
</span
><span class="headerAction actionDisconnect" ng-click="disconnect()"><i class="icon-off"></i></span>
<div class="overlay" ng-click="showNewFeed = false" ng-class="{active: showNewFeed}"></div>
</div>
</header>

<div class="feeds">
<div class="feed" ng-repeat="feed in feeds">
<p class="title">{{feed.name}}</p>
<p class="description">{{feed.description}}</p>
<div class="articles" ng-class="{active: feed.showArticles}">
<p class="article" ng-repeat="article in feed.items"><a href="{{article.link}}" target="_blank">{{article.title}}</a></p>
</div>
<span class="showArticlesButton" ng-click="feed.showArticles = !feed.showArticles"><i ng-class="{'icon-arrow-down': !feed.showArticles, 'icon-arrow-up': feed.showArticles}"></i></span>
<span class="deleteButton" ng-click="feed.deletePopup = true"><i class="icon-remove"></i></span>
<div class="overlay" ng-click="feed.deletePopup = false" ng-class="{active: feed.deletePopup}"></div>
<div class="deletePopup" ng-class="{active: feed.deletePopup}">
<p>Do you really want to delete this feed ?</p>
<a class="btn btn-danger btnDeletePopup" ng-click="deleteFeed(feed)">Yes</a><a class="btn btnDeletePopup" ng-click="feed.deletePopup = false">No</a>
</div>
</div>
</div>
</div>
21 changes: 21 additions & 0 deletions webapp/partials/loginView.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<div class="container login-screen" id="loginView" ng-controller="loginCtrl">

<div class="login-icon">
<img src="images/icon.png" alt="Welcome to Freader">
<h4>Welcome to <small>Freader</small></h4>
</div>
<form ng-submit="action()" class="login-form" name="actionForm">
<p class="errorMsg">{{errorMsg}}</p>
<div class="control-group">
<input type="email" class="login-field" id="login-name" placeholder="Email" ng-model="email" required>
<label class="login-field-icon fui-user" for="login-name"></label>
</div>
<div class="control-group">
<input type="password" class="login-field" id="login-pass" placeholder="Password" ng-model="password" required>
<label class="login-field-icon fui-lock" for="login-pass"></label>
</div>
<input type="submit" value="{{text.action}}" ng-disabled="actionForm.$invalid" class="btn btn-primary btn-large btn-block">
<a ng-click="changeAction()" class="actionChange">{{text.changeAction}}</a>
</form>

</div>
4 changes: 2 additions & 2 deletions webapp/webapp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ angular.module('backend', ['ngResource']).
angular.module('Freader', ['backend'])
.config(function ($routeProvider) {
$routeProvider.
when("/", {controller: loginCtrl, template: document.getElementById('loginView').text}).
when("/feeds", {controller: feedsCtrl, template: document.getElementById('feedsView').text}).
when("/", {controller: loginCtrl, templateUrl: 'partials/loginView.html'}).
when("/feeds", {controller: feedsCtrl, templateUrl: 'partials/feedsView.html'}).
otherwise({redirectTo:'/'});
});

Expand Down