Skip to content
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

Jump to bottom

Bootstrap navigation bar #182

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

Bootstrap navigation bar #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
54a3cc9
Added flag.png in images folder and including it on index.html then …
Oct 27, 2014
fb18c54
added a div with national flag in it
Oct 30, 2014
f0b27ba
i style the national flag image using brand class on css
Oct 30, 2014
1a4d202
i added a national flag image in the image directory forlder
Oct 30, 2014
aff16fc
I deleted flag.png for quality of image reasons
Oct 30, 2014
36b4af8
i added a new flag on my local repository and style the logo in main.…
Nov 17, 2014
b5b47c3
i added a new flag on my local repository and style the logo in main.…
Nov 17, 2014
eb0b29a
i deleted old flag on my local repository
Nov 17, 2014
2f1c9c5
pip installation on windows platform
Nov 18, 2014
f7dcd10
new updates
Jan 14, 2015
f6a5ad3
i pulled the repository from my github account
Jan 14, 2015
3b29d70
new clean commit
Jan 15, 2015
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: 4 additions & 0 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,11 @@ Install virtualenv_ and virtualenvwrapper (you might need admin rights for this)

pip install virtualenv virtualenvwrapper

<<<<<<< HEAD
For windows only, install virtualenvwrapper-win_ using pip: ::
=======
For windows only virtualenvwrapper-win_ using pip: ::
>>>>>>> 2f1c9c5944cd5bc168183e3f0c5fc83967de4323

pip install virtualenvwrapper-win

Expand Down
62 changes: 62 additions & 0 deletions app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,66 @@
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->

<!-- Add your site or application content here -->
<nav class="navbar navbar-default">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<!-- <a class="navbar-brand" href="#">Brand</a> -->
<h3 class="text-muted brand" translate>Tanzania Waterpoints</h3>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="header collapse navbar-collapse" id="bs-example-navbar-collapse-1" ng-controller="NavCtrl">
<ul class="nav navbar-nav navbar-right">
<!--li><a ng-href="#/waterpoints/new">
<span class="glyphicon glyphicon-plus"></span>
Create waterpoint
</a></li-->
<li ng-class="{active: location.path() == '/'}" class="active"><a ng-href="#" translate>Home<span class="sr-only">(current)</span></a></li>
<li ng-class="{active: location.path() == '/requests'}"><a ng-href="#/requests" translate>Triage</a></li>
<li ng-class="{active: location.path() == '/waterpoints/new'}">
<a ng-href="#/waterpoints/new"><span class="glyphicon glyphicon-plus"></span> {{"Add Waterpoint" | translate}}</a></li>
<li ng-class="{active: location.path() == '/dashboard'}"><a ng-href="#/dashboard" translate>Dashboard</a></li>
<li ng-controller="LocaleCtrl">
<select class="navbar-form navbar-left form-control" ng-model="languages.current"
ng-options="key as value for (key, value) in languages.available">
</select>
</li>
</ul>
</div>
<hr>

<div flash-alert="success" active-class="in alert" class="fade" duration="0">
<button type="button" class="close" ng-click="hide()">&times;</button>
<strong class="alert-heading">Success:</strong>
<span class="alert-message">{{flash.message}}</span>
</div>

<div flash-alert="error" active-class="in alert" class="fade" duration="0">
<button type="button" class="close" ng-click="hide()">&times;</button>
<strong class="alert-heading">Error:</strong>
<span class="alert-message">{{flash.message}}</span>
</div>

<div flash-alert="info" active-class="in alert" class="fade" duration="0">
<button type="button" class="close" ng-click="hide()">&times;</button>
<strong class="alert-heading">Info:</strong>
<span class="alert-message">{{flash.message}}</span>
</div>

<div class="content" ng-view></div>

</div>
<!-- \container -->
</nav>

<!-- Add your site or application content here -->
<div class="container">

Expand Down Expand Up @@ -100,6 +160,8 @@ <h3 class="text-muted brand" translate>Tanzania Waterpoints</h3>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
<script src="//rawgithub.com/sdecima/javascript-detect-element-resize/master/detect-element-resize.js"></script>
<!-- Latest compiled and minified JavaScript -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js"></script>

<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0-rc.3/angular.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0-rc.3/angular-resource.min.js"></script>
Expand Down
22 changes: 16 additions & 6 deletions app/styles/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* http://angular-ui.github.io/bootstrap/#/getting_started */
.nav, .pagination, .carousel, .panel-title a { cursor: pointer; }
@import url('media.css');

.form-control {
padding: 3px;
Expand Down Expand Up @@ -302,13 +301,24 @@ div.region-info {
.brand{
width: 60px;
height: 40px;
/*border-radius: 10%;*/
background: url('../images/Tanzania.png') no-repeat left center;
margin-left: 10px;
padding-left: 80px;
background: url('../images/Tanzania.png') no-repeat left center;
margin-left: 10px;
padding-left: 80px;
font-size: 1.5em;
}
.btn{
float: right;
position: relative;
margin-top: -20px;
}
.navbar-nav select{
position: relative;
top: .5em;
}
.navbar-nav{
position: relative;
top: 1em;
}
.navbar-header button{
top: 1em;
}
Empty file added app/styles/media.css
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion app/views/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="panel panel-default">
<div class="panel panel-default ">
<div class="panel-heading"><h3 class="panel-title" translate>Filter map view</h3> <div class="form-group">
<button class="btn btn-warning" ng-click="reset()" translate>Reset</button>
</div> </div>
Expand Down
87 changes: 87 additions & 0 deletions npm-debug.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
0 info it worked if it ends with ok
1 verbose cli [ '/usr/bin/node', '/usr/bin/npm', 'install', 'Flask-script' ]
2 info using [email protected]
3 info using [email protected]
4 verbose node symlink /usr/bin/node
5 warn package.json [email protected] No repository field.
6 warn package.json [email protected] No README data
7 verbose readDependencies using package.json deps
8 verbose cache add [ 'Flask-script', null ]
9 verbose cache add name=undefined spec="Flask-script" args=["Flask-script",null]
10 verbose parsed url { protocol: null,
10 verbose parsed url slashes: null,
10 verbose parsed url auth: null,
10 verbose parsed url host: null,
10 verbose parsed url port: null,
10 verbose parsed url hostname: null,
10 verbose parsed url hash: null,
10 verbose parsed url search: null,
10 verbose parsed url query: null,
10 verbose parsed url pathname: 'Flask-script',
10 verbose parsed url path: 'Flask-script',
10 verbose parsed url href: 'Flask-script' }
11 silly lockFile fcaf8827-Flask-script Flask-script
12 verbose lock Flask-script /home/imma/.npm/fcaf8827-Flask-script.lock
13 silly lockFile fcaf8827-Flask-script Flask-script
14 silly lockFile fcaf8827-Flask-script Flask-script
15 verbose addNamed [ 'Flask-script', '' ]
16 verbose addNamed [ null, '*' ]
17 silly lockFile cafa4292-Flask-script Flask-script@
18 verbose lock Flask-script@ /home/imma/.npm/cafa4292-Flask-script.lock
19 silly addNameRange { name: 'Flask-script', range: '*', hasData: false }
20 verbose request where is /Flask-script
21 verbose request registry https://registry.npmjs.org/
22 verbose request id 9c7fff80fe1b8d6c
23 verbose url raw /Flask-script
24 verbose url resolving [ 'https://registry.npmjs.org/', './Flask-script' ]
25 verbose url resolved https://registry.npmjs.org/Flask-script
26 verbose request where is https://registry.npmjs.org/Flask-script
27 info trying registry request attempt 1 at 18:42:05
28 http GET https://registry.npmjs.org/Flask-script
29 http 404 https://registry.npmjs.org/Flask-script
30 verbose headers { date: 'Sun, 04 Jan 2015 15:42:22 GMT',
30 verbose headers server: 'CouchDB/1.5.0 (Erlang OTP/R16B03)',
30 verbose headers 'content-type': 'application/json',
30 verbose headers 'cache-control': 'max-age=0',
30 verbose headers 'content-length': '52',
30 verbose headers 'accept-ranges': 'bytes',
30 verbose headers via: '1.1 varnish',
30 verbose headers age: '0',
30 verbose headers 'x-served-by': 'cache-lcy1127-LCY',
30 verbose headers 'x-cache': 'MISS',
30 verbose headers 'x-cache-hits': '0',
30 verbose headers 'x-timer': 'S1420386142.781700,VS0,VE155',
30 verbose headers 'keep-alive': 'timeout=10, max=50',
30 verbose headers connection: 'Keep-Alive' }
31 silly registry.get cb [ 404,
31 silly registry.get { date: 'Sun, 04 Jan 2015 15:42:22 GMT',
31 silly registry.get server: 'CouchDB/1.5.0 (Erlang OTP/R16B03)',
31 silly registry.get 'content-type': 'application/json',
31 silly registry.get 'cache-control': 'max-age=0',
31 silly registry.get 'content-length': '52',
31 silly registry.get 'accept-ranges': 'bytes',
31 silly registry.get via: '1.1 varnish',
31 silly registry.get age: '0',
31 silly registry.get 'x-served-by': 'cache-lcy1127-LCY',
31 silly registry.get 'x-cache': 'MISS',
31 silly registry.get 'x-cache-hits': '0',
31 silly registry.get 'x-timer': 'S1420386142.781700,VS0,VE155',
31 silly registry.get 'keep-alive': 'timeout=10, max=50',
31 silly registry.get connection: 'Keep-Alive' } ]
32 silly lockFile cafa4292-Flask-script Flask-script@
33 silly lockFile cafa4292-Flask-script Flask-script@
34 error 404 404 Not Found: Flask-script
34 error 404
34 error 404 'Flask-script' is not in the npm registry.
34 error 404 You should bug the author to publish it
34 error 404 It was specified as a dependency of 'TaarifaWaterpoints'
34 error 404
34 error 404 Note that you can also install from a
34 error 404 tarball, folder, or http url, or git url.
35 error System Linux 3.13.0-32-generic
36 error command "/usr/bin/node" "/usr/bin/npm" "install" "Flask-script"
37 error cwd /home/imma/TaarifaWaterpoints
38 error node -v v0.10.33
39 error npm -v 1.4.28
40 error code E404
41 verbose exit [ 1, true ]
5 changes: 5 additions & 0 deletions src/pip-delete-this-directory.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
This file is placed here by pip to indicate the source was put
here by pip.

Once this package is successfully installed this source code will be
deleted (unless you remove this file).
1 change: 1 addition & 0 deletions src/taarifaapi
Open in desktop
Submodule taarifaapi added at b85437