Skip to content

Design fix #24

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

Merged
merged 5 commits into from
Apr 22, 2016
Merged

Design fix #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
03e61f7
Merge pull request #2 from appirio-tech/dev
Nov 20, 2015
5c82ce1
Merge pull request #3 from appirio-tech/kohata-work
Nov 24, 2015
61db5b7
Merge branch 'dev'
Mar 21, 2016
29c0c9e
Merge pull request #23 from appirio-tech/dev
parthshah Apr 4, 2016
126b9ff
Design fix
sudoster Apr 22, 2016
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
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
# support-admin-app
Customer support application
Customer support application <br>

angular.js app using INSPINIA template
2 changes: 1 addition & 1 deletion src/app/addmembers/add.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

<div class="row wrapper border-bottom white-bg page-heading">
<div class="col-lg-10">
<h2>Add Members</h2>
<h2>Import Users</h2>
</div>
<div class="col-lg-2">
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/sso/sso.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

<div class="row wrapper border-bottom white-bg page-heading">
<div class="col-lg-10">
<h2>Add SSO Users</h2>
<h2>Import SSO Users</h2>
</div>
<div class="col-lg-2">
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/users/users.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

<div class="row wrapper border-bottom white-bg page-heading">
<div class="col-lg-10">
<h2>Members</h2>
<h2>Users</h2>
</div>
<div class="col-lg-2">
</div>
Expand Down
18 changes: 10 additions & 8 deletions src/components/common/navigation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@
<li ui-sref-active="active">
<a ui-sref="index.main"><i class="fa fa-laptop"></i> <span class="nav-label">Dashboard</span> </a>
</li>
<li ui-sref-active="active">
<a ui-sref="index.users"><i class="fa fa-male"></i> <span class="nav-label">Members</span> </a>
</li>
<li ui-sref-active="active">
<a ui-sref="index.sso"><i class="fa fa-male"></i> <span class="nav-label">Add SSO Members</span> </a>
</li>
<li ui-sref-active="active">
<a ui-sref="index.addmembers"><i class="fa fa-male"></i> <span class="nav-label">Add Members</span> </a>
<li ui-sref-active="active">
<a href="#"><i class="fa fa-male"></i> <span class="nav-label">User Management</span>
<span class="fa arrow"></span></a>
<ul class="nav nav-second-level collapse">
<li>
<li><a ui-sref="index.users">User</a></li>
<li><a ui-sref="index.addmembers">Import Users</a></li>
<li><a ui-sref="index.sso">Import SSO Users</a></li>
</li>
</ul>
</li>
<li ui-sref-active="active">
<a ui-sref="index.submissions.list"><i class="fa fa-cloud-upload"></i> <span class="nav-label">Submissions</span> </a>
Expand Down