Skip to content

Commit

Permalink
Merge pull request #11 from dapetcu21/master
Browse files Browse the repository at this point in the history
Something to show off
  • Loading branch information
dapetcu21 committed Aug 18, 2014
2 parents fe54be2 + 60f8766 commit 3184a4c
Show file tree
Hide file tree
Showing 25 changed files with 507 additions and 143 deletions.
Binary file added app/assets/img/menu-about.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/img/menu-landmarks.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/img/menu-maps.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/img/menu-planning.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/img/menu-restricted.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/img/menu-routes.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/img/menu-trails.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions app/css/global.styl
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
body
background-color: #000
user-select: none;
-webkit-touch-callout: none;

.status-bar
background-color: #000
2 changes: 1 addition & 1 deletion app/css/map.styl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
.map-jumpcontrol
content: 'J'
left: 0.5em
bottom: 5em
bottom: 0.5em

&.hidden
display: none
55 changes: 50 additions & 5 deletions app/css/menu.styl
Original file line number Diff line number Diff line change
@@ -1,10 +1,55 @@
.menu-button
background: #fff
background: #444
background-size: cover
background-position: 50% 50%
background-repeat: no-repeat

.menu-button-text
color: #000
color: #fff
font-family: 'Source Sans Pro', sans-serif
font-size: 40px
font-size: 17pt
text-align: center
text-shadow: 2px 2px 3px #000

.menu-button-text.menu-0
content: '1'
.menu-title
color: #fff
font-family: 'Source Sans Pro', sans-serif
font-size: 17pt

.menu-settings-icon i
color: #fff

.menu-bg
background-color: #000

.menu-button.menu-routes
background-image: url('../assets/img/menu-routes.jpg')

.menu-button.menu-trails
background-image: url('../assets/img/menu-trails.jpg')

.menu-button.menu-about
background-image: url('../assets/img/menu-about.jpg')

.menu-button.menu-restricted
background-image: url('../assets/img/menu-restricted.jpg')

.menu-button.menu-landmarks
background-image: url('../assets/img/menu-landmarks.jpg')

.menu-button.menu-planning
background-image: url('../assets/img/menu-planning.jpg')

.menu-button.menu-maps
background-image: url('../assets/img/menu-maps.jpg')

@keyframes kenburns {
0% { background-position: 50% 50% }
25% { background-position: 100% 50% }
75% { background-position: 0% 50% }
100% { background-position: 50% 50% }
}

.menu-button
//animation: kenburns 100s infinite
//animation-timing-function: ease-in-out
5 changes: 4 additions & 1 deletion app/css/template.styl
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@
.template-container-inner
overflow-x: hidden //Collapses margins

padding: 1em
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;

.template-bg
background-color: #ccc
background-color: #f9f9f9
1 change: 1 addition & 0 deletions app/css/title.styl
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.title-bar
background-color: #fff
border-bottom: 1px solid #ddd

.title-bar-text
color: #000
Expand Down
1 change: 0 additions & 1 deletion app/index.jade
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ html(lang="en")
// build:css({.tmp,dist}) css/bundle.css
link(rel="stylesheet", href="css/main.css")
// endbuild
link(href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,700,400italic' rel='stylesheet' type='text/css')
body
script(src="cordova.js")
// build:js({.tmp,dist}) js/main.js
Expand Down
87 changes: 87 additions & 0 deletions app/js/controllers/mainmenu-controller.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
var util = require('util');
var MenuController = require('./menu-controller');
var MapController = require('./map-controller');
var Famous = require('../shims/famous');
var _ = require('lodash');
var templates = require('../lib/templates');
var TemplateController = require('./template-controller');
var T = require('../translate');

function MainMenuController(options) {
options = options || {};
options.buttonDescriptors = {
about: {
title: T.span({
ro: 'Despre Deltă',
en: 'About the Delta',
}),
viewController: function () {
return new TemplateController({
template: templates.article,
title: 'Some Template',
backIcon: 'fa-home',
});
},
},
restricted: {
title: T.span({
ro: 'Zone strict protejate',
en: 'Preserved areas',
}),
},
landmarks: {
title: T.span({
ro: 'Atracții turistice',
en: 'Landmarks',
}),
},
planning: {
title: T.span({
ro: 'Planificare',
en: 'Planning',
}),
},
routes: {
title: T.span({
ro: 'Trasee navale',
en: 'Boat routes',
}),
},
trails: {
title: T.span({
ro: 'Trasee terestre',
en: 'Hiking trails',
}),
},
maps: {
title: T.span({
ro: 'Harta Deltei',
en: 'Map of the Delta',
}),
viewController: function () {
return new MapController({
backIcon: 'fa-home',
});
},
},
settings: {
}
};

options.buttonLayout = [
['routes', 'trails'],
['landmarks', 'planning'],
['about', 'restricted'],
['maps'],
];

options.title = T.span({
ro: 'Delta Dunării',
en: 'The Danube Delta',
});

MenuController.call(this, options);
}
util.inherits(MainMenuController, MenuController);

module.exports = MainMenuController;
Loading

0 comments on commit 3184a4c

Please sign in to comment.