Skip to content
This repository was archived by the owner on Aug 25, 2018. It is now read-only.

updates for view/header-bar directives #1

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

updates for view/header-bar directives #1

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
35 changes: 17 additions & 18 deletions Ionic-Chatroom/www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,22 @@
<script src="js/controllers.js"></script>
</head>

<body ng-app="chatRoom" ng-controller="AppCtrl">
<pane nav-router animation="slide-left-right-ios7">
<!--
The nav bar that will be updated as we navigate between views
Additional attributes set its look, nav-bar animation and icons
Icons provided by Ionicons: http://ionicons.com/
-->
<nav-bar type="bar-energized"
animation="nav-title-slide-ios7"
back-button-type="button-icon"></nav-bar>

<!--
The views will be rendered in the <nav-view> directive below
Templates are in the /templates folder (but you could also
have templates inline in this html file if you'd like).
-->
<nav-view></nav-view>
</pane>
<body ng-app="chatRoom" ng-controller="AppCtrl" animation="slide-left-right-ios7">
<!--
The nav bar that will be updated as we navigate between views
Additional attributes set its look, nav-bar animation and icons
Icons provided by Ionicons: http://ionicons.com/
-->
<nav-bar type="bar-energized"
animation="nav-title-slide-ios7"
back-button-type="button-icon"></nav-bar>

<!--
The views will be rendered in the <nav-view> directive below
Templates are in the /templates folder (but you could also
have templates inline in this html file if you'd like).
-->
<nav-view></nav-view>

</body>
</html>
12 changes: 5 additions & 7 deletions Ionic-Chatroom/www/templates/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
<header-bar

<view id="app-page"
title="'About'"
left-buttons="leftButtons"
right-buttons="rightButtons"
type="bar-energized"
align-title="center">
</header-bar>
right-buttons="rightButtons">

<nav-page id="app-page">
<content has-header="true" padding="true">
<h3>About this app</h3>
<p>
This is a chat app originally created by <a href="http://3dd13.me">3dd13</a> then modified by <a href="https://github.com/mlynch">Max Lynch</a> and <a href="https://github.com/abeisgreat">Abe Haskins</a>.
</p>
</content>
</nav-page>

</view>
16 changes: 7 additions & 9 deletions Ionic-Chatroom/www/templates/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
<header-bar
title="'Home'"

<view title="'Home'"
left-buttons="leftButtons"
right-buttons="rightButtons"
type="bar-energized"
align-title="center">
</header-bar>
<view>
<content>
right-buttons="rightButtons">

<content has-header="true">
<list>
<item ng-repeat="room in rooms" type="item-text-wrap" href="#/rooms/{{room.id}}" ng-if="room.title">
<h3>{{room.title}}</h3>
<p>{{room.description}}</p>
</item>
</list>
</content>
</nav-view>

</view>
15 changes: 7 additions & 8 deletions Ionic-Chatroom/www/templates/new_room.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<view>
<header-bar
title="'Create a Room'"
left-buttons="leftButtons"
right-buttons="rightButtons"
type="bar-energized"
align-title="center">
</header-bar>

<view
title="'Create a Room'"
left-buttons="leftButtons"
right-buttons="rightButtons">

<content has-header="true">
<form ui-keypress="{13:'createRoom()'}">
<div class="list list-inset">
Expand All @@ -23,4 +21,5 @@
</div>
</form>
</content>

</view>
12 changes: 5 additions & 7 deletions Ionic-Chatroom/www/templates/room.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
<header-bar
title="room.title"

<view title="room.title"
left-buttons="leftButtons"
right-buttons="rightButtons"
type="bar-energized"
align-title="center">
</header-bar>
right-buttons="rightButtons">

<view title="room.title">
<content
scroll="true"
on-refresh="onRefresh()"
on-refresh-opening="onRefreshOpening(amount)"
refresh-complete="refreshComplete"
animate-nav="true"
has-header="true"
>

<div ng-repeat="message in messages | orderBy:'created_at'" type="item-text-wrap" ng-show="message.content">
Expand All @@ -36,4 +33,5 @@
</form>
</div>
</div>

</view>