Skip to content
This repository was archived by the owner on Mar 21, 2023. It is now read-only.

Make html partials consistent #11

Open
svdgraaf wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make html partials consistent #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18a2ffb
Make html consistent
svdgraaf Aug 3, 2017
3510171
the space is back from the bar
svdgraaf Sep 7, 2017
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
24 changes: 10 additions & 14 deletions app/partials/accounts/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
<label class="item item-input">
<i class="icon ion-search placeholder-icon"></i>
<input
tabindex="1"
id="search"
type="text"
placeholder="Search"
ng-model="query"
/>
<i class="icon ion-search placeholder-icon"></i>
<input tabindex="1"
id="search"
type="text"
placeholder="Search"
ng-model="query" />
</label>
<a
class="item item-icon-right"
ui-sref="accounts.show({accountId: account.id})"
ng-repeat="account in accounts.accounts |filter:query | orderBy:orderProp"
>
<a class="item item-icon-right"
ui-sref="accounts.show({accountId: account.id})"
ng-repeat="account in accounts.accounts |filter:query | orderBy:orderProp">
{{account.name}}
<i class="icon ion-ios-arrow-forward"></i>
</a>
</a>
70 changes: 29 additions & 41 deletions app/partials/accounts/show.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,37 @@
<ion-list>
<label class="item item-input item-stacked-label">
<span class="input-label">Name</span>
<input
type="text"
placeholder="My Account"
ng-model="account.name"
/>
</label>
<label class="item item-input item-stacked-label">
<span class="input-label">Name</span>
<input type="text"
placeholder="My Account"
ng-model="account.name" />
</label>

<label class="item item-input item-stacked-label">
<span class="input-label">AWS Account Number</span>
<input
type="text"
placeholder="12345654321"
ng-model="account.number"
/>
</label>
<label class="item item-input item-stacked-label">
<span class="input-label">AWS Account Number</span>
<input type="text"
placeholder="12345654321"
ng-model="account.number" />
</label>

<label class="item item-input item-stacked-label">
<span class="input-label">AWS Access Key ID</span>
<input
type="text"
placeholder="AKIAXXXXXXXXXXXXXXXX"
ng-model="account.access_key_id"
/>
</label>
<label class="item item-input item-stacked-label">
<span class="input-label">AWS Access Key ID</span>
<input type="text"
placeholder="AKIAXXXXXXXXXXXXXXXX"
ng-model="account.access_key_id" />
</label>

<label class="item item-input item-stacked-label">
<span class="input-label">Avatar URL</span>
<input
type="text"
placeholder="http://path.to/some_image.png"
ng-model="account.avatar_url"
/>
</label>
<label class="item item-input item-stacked-label">
<span class="input-label">Avatar URL</span>
<input type="text"
placeholder="http://path.to/some_image.png"
ng-model="account.avatar_url" />
</label>
</ion-list>

<div class="padding">
<button
class="button button-block button-positive"
ng-click="save()"
>Save Account</button>
<button class="button button-block button-positive"
ng-click="save()">Save Account</button>

<button
class="button button-block button-assertive"
ng-click="delete()"
>Delete Account</button>
</div>
<button class="button button-block button-assertive"
ng-click="delete()">Delete Account</button>
</div>
7 changes: 4 additions & 3 deletions app/partials/bookmarks/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<ion-content overflow-scroll="true" class="has-header has-footer">
<div ui-view></div>
</ion-content>
<ion-content overflow-scroll="true"
class="has-header has-footer">
<div ui-view></div>
</ion-content>
55 changes: 26 additions & 29 deletions app/partials/bookmarks/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,27 @@
<ion-list ng-keydown="keydown($event)" id="bookmarks">
<label class="item item-input">
<i class="icon ion-search placeholder-icon"></i>
<input
tabindex="1"
id="search"
type="text"
placeholder="Search"
ng-model="query"
/>
</label>
<a
class="item item-avatar item-button-right"
ng-class="{active: $index == position}"
ng-click="getToken(bookmark)"
ng-repeat="bookmark in bookmarks.bookmarks
|byNameOrAccountNumber:query
|orderBy:orderProp"
>
<img ng-if="!gravatar(bookmark)" ng-src="{{bookmark.avatar_url}}" />
<img ng-if="gravatar(bookmark)" gravatar-src="bookmark.avatar_url || bookmark.name" />
<h2>{{bookmark.name}}</h2>
<p>{{bookmark.account_number}}/{{bookmark.role_name}}</p>
<button
class="button button-clear button-positive"
ui-sref="bookmarks.show({bookmarkId: bookmark.id})"
ng-click="$event.stopPropagation()"
><i class="icon ion-ios-information-outline"></i></button>
</a>
<ion-list ng-keydown="keydown($event)"
id="bookmarks">
<label class="item item-input">
<i class="icon ion-search placeholder-icon"></i>
<input tabindex="1"
id="search"
type="text"
placeholder="Search"
ng-model="query" />
</label>
<a class="item item-avatar item-button-right"
ng-class="{active: $index == position}"
ng-click="getToken(bookmark)"
ng-repeat="bookmark in bookmarks.bookmarks
|byNameOrAccountNumber:query
|orderBy:orderProp">
<img ng-if="!gravatar(bookmark)"
ng-src="{{bookmark.avatar_url}}" />
<img ng-if="gravatar(bookmark)"
gravatar-src="bookmark.avatar_url || bookmark.name" />
<h2>{{bookmark.name}}</h2>
<p>{{bookmark.account_number}}/{{bookmark.role_name}}</p>
<button class="button button-clear button-positive"
ui-sref="bookmarks.show({bookmarkId: bookmark.id})"
ng-click="$event.stopPropagation()"><i class="icon ion-ios-information-outline"></i></button>
</a>
</ion-list>
16 changes: 7 additions & 9 deletions app/partials/bookmarks/otp.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<div class="list list-inset">
<label class="item-input">
<i class="icon ion-locked placeholder-icon"></i>
<input
id="token_code"
type="text"
ng-model="data.token_code"
autofocus="autofocus"
></input>
</label>
<label class="item-input">
<i class="icon ion-locked placeholder-icon"></i>
<input id="token_code"
type="text"
ng-model="data.token_code"
autofocus="autofocus"></input>
</label>
</div>
70 changes: 29 additions & 41 deletions app/partials/bookmarks/show.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,37 @@
<ion-list>
<label class="item item-input item-stacked-label">
<span class="input-label">Name</span>
<input
type="text"
placeholder="My Bookmark"
ng-model="bookmark.name"
/>
</label>
<label class="item item-input item-stacked-label">
<span class="input-label">Name</span>
<input type="text"
placeholder="My Bookmark"
ng-model="bookmark.name" />
</label>

<label class="item item-input item-stacked-label">
<span class="input-label">AWS Account Number</span>
<input
type="text"
placeholder="12345654321"
ng-model="bookmark.account_number"
/>
</label>
<label class="item item-input item-stacked-label">
<span class="input-label">AWS Account Number</span>
<input type="text"
placeholder="12345654321"
ng-model="bookmark.account_number" />
</label>

<label class="item item-input item-stacked-label">
<span class="input-label">Role Name</span>
<input
type="text"
placeholder="johndoe"
ng-model="bookmark.role_name"
/>
</label>
<label class="item item-input item-stacked-label">
<span class="input-label">Role Name</span>
<input type="text"
placeholder="johndoe"
ng-model="bookmark.role_name" />
</label>

<label class="item item-input item-stacked-label">
<span class="input-label">Avatar URL</span>
<input
type="text"
placeholder="http://path.to/some_image.png"
ng-model="bookmark.avatar_url"
/>
</label>
<label class="item item-input item-stacked-label">
<span class="input-label">Avatar URL</span>
<input type="text"
placeholder="http://path.to/some_image.png"
ng-model="bookmark.avatar_url" />
</label>
</ion-list>

<div class="padding">
<button
class="button button-block button-positive"
ng-click="save()"
>Save Bookmark</button>
<button class="button button-block button-positive"
ng-click="save()">Save Bookmark</button>

<button
class="button button-block button-assertive"
ng-click="delete()"
>Delete Bookmark</button>
</div>
<button class="button button-block button-assertive"
ng-click="delete()">Delete Bookmark</button>
</div>
2 changes: 1 addition & 1 deletion app/partials/common/empty.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div ui-view></div>
<div ui-view></div>
7 changes: 4 additions & 3 deletions app/partials/common/list-index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<ion-content overflow-scroll="true" class="has-header has-footer">
<ion-list ui-view></ion-list>
</ion-content>
<ion-content overflow-scroll="true"
class="has-header has-footer">
<ion-list ui-view></ion-list>
</ion-content>
2 changes: 1 addition & 1 deletion app/partials/footer/empty.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<div class="button-bar">
</div>
</div>
39 changes: 18 additions & 21 deletions app/partials/footer/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
<div class="button-bar">
<button class="button button-clear"
ui-sref="bookmarks.list"
ng-class="{
'button-positive': $state.includes('bookmarks')
}"
><i class="icon ion-ios-unlocked"></i></button>
<button class="button button-clear"
ui-sref="bookmarks.list"
ng-class="{
'button-positive': $state.includes('bookmarks')
}"><i class="icon ion-ios-unlocked"></i></button>

<button class="button button-clear"
ng-show="$settings.account_management"
ui-sref="accounts.list"
ng-class="{
'button-positive': $state.includes('accounts')
}"
><i class="icon ion-cloud"></i></button>
<button class="button button-clear"
ng-show="$settings.account_management"
ui-sref="accounts.list"
ng-class="{
'button-positive': $state.includes('accounts')
}"><i class="icon ion-cloud"></i></button>

<button class="button button-clear"
ui-sref="settings"
ng-class="{
'button-positive': $state.includes('settings'),
'icon-spin': jobs > 0
}"
><i class="icon ion-gear-a"></i></button>
</div>
<button class="button button-clear"
ui-sref="settings"
ng-class="{
'button-positive': $state.includes('settings'),
'icon-spin': jobs > 0
}"><i class="icon ion-gear-a"></i></button>
</div>
19 changes: 8 additions & 11 deletions app/partials/header/accounts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
<button
ui-sref="accounts.show"
class="button button-positive button-clear"
ng-show="$state.includes('accounts.list')"
><i class="icon ion-ios-plus-empty"></i></button>
<button ui-sref="accounts.show"
class="button button-positive button-clear"
ng-show="$state.includes('accounts.list')"><i class="icon ion-ios-plus-empty"></i></button>

<button
ui-sref="accounts.list"
class="button button-positive button-clear"
ng-hide="$state.includes('accounts.list')"
><i class="icon ion-ios-arrow-back"></i> Accounts</button>
<button ui-sref="accounts.list"
class="button button-positive button-clear"
ng-hide="$state.includes('accounts.list')"><i class="icon ion-ios-arrow-back"></i> Accounts</button>

<h1 id="title" class="title">Accounts</h1>
<h1 id="title"
class="title">Accounts</h1>
19 changes: 8 additions & 11 deletions app/partials/header/bookmarks.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
<button
ui-sref="bookmarks.show"
class="button button-positive button-clear"
ng-show="$state.includes('bookmarks.list')"
><i class="icon ion-ios-plus-empty"></i></button>
<button ui-sref="bookmarks.show"
class="button button-positive button-clear"
ng-show="$state.includes('bookmarks.list')"><i class="icon ion-ios-plus-empty"></i></button>

<button
ui-sref="bookmarks.list"
class="button button-positive button-clear"
ng-hide="$state.includes('bookmarks.list')"
><i class="icon ion-ios-arrow-back"></i> Bookmarks</button>
<button ui-sref="bookmarks.list"
class="button button-positive button-clear"
ng-hide="$state.includes('bookmarks.list')"><i class="icon ion-ios-arrow-back"></i> Bookmarks</button>

<h1 id="title" class="title">Bookmarks</h1>
<h1 id="title"
class="title">Bookmarks</h1>
3 changes: 2 additions & 1 deletion app/partials/header/setup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
<h1 id="title" class="title">Setup</h1>
<h1 id="title"
class="title">Setup</h1>
3 changes: 2 additions & 1 deletion app/partials/header/welcome.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
<h1 id="title" class="title">Welcome</h1>
<h1 id="title"
class="title">Welcome</h1>
Loading