Skip to content

Commit

Permalink
menu is a panel v0.5.0-alpha1 release, fixes #78
Browse files Browse the repository at this point in the history
  • Loading branch information
@fczuardi
fczuardi committed May 2, 2014
1 parent 91999c5 commit 13bc5f7
Show file tree
Hide file tree
Showing 6 changed files with 119 additions and 100 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "companion",
"version": "0.4.4",
"version": "0.5.0-alpha.1",
"description": "Companion is a mobile application to track schedules of conferences and events.",
"scripts": {
"cordova-setup": "./node_modules/.bin/gulp cordova:setup",
Expand Down
1 change: 1 addition & 0 deletions src/scripts/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Handlebars.registerPartial('session', require('../templates/partials/session.hbs
Handlebars.registerPartial('notifications', notificationsTemplate);
Handlebars.registerPartial('update_item', require('../templates/partials/update_item.hbs'));
Handlebars.registerPartial('map', require('../templates/partials/map.hbs'));
Handlebars.registerPartial('menu', require('../templates/partials/menu.hbs'));

var templates = {
app: require('../templates/partials/app.hbs'),
Expand Down
48 changes: 30 additions & 18 deletions src/scripts/lib/companion/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,12 +340,19 @@ module.exports = function($, FISLParser, templates){
});
};

var openMapTab = function(roomID){
//select map panel
var displayPanel = function(panelName){
var tabName = '#'+panelName+'-tab',
viewName = '#'+panelName+'-view';
$('#app-menu .navbar-nav > li.active').removeClass('active');
$('#map-tab').addClass('active');
$(tabName).addClass('active');
$('.app-panel').removeClass('selected');
$('#map-view').addClass('selected');
$(viewName).addClass('selected');

};

var openMapTab = function(roomID){
//select map panel
displayPanel('map');
console.log('openMapTab roomID='+roomID);
// mapPan.reset();
// mapPan.resetDimensions();
Expand Down Expand Up @@ -377,6 +384,19 @@ module.exports = function($, FISLParser, templates){
loadFeed();
};

var updateMenuSyncMessage = function(){
console.log('updateMenuSyncMessage')
//update sync time on each dropdown open
var updateInfoContainer = $('#last-sync-menu-header'),
template = templates.last_sync_time;
updateInfoContainer.html(
template({
lastFetchTime: updateInfo.time
})
);
console.log('sync display updated');
};

var appTabClicked = function (event){
var linkElement = $(this),
parentLi = linkElement.parents('li').first(),
Expand Down Expand Up @@ -412,8 +432,10 @@ module.exports = function($, FISLParser, templates){
} else if (sectionName === 'map'){
console.log('Map tab clicked');
openMapTab();
} else if (sectionName === 'menu'){
displayPanel('menu');
updateMenuSyncMessage();
}

};

var setupAppHeaderBar = function(){
Expand All @@ -423,25 +445,14 @@ module.exports = function($, FISLParser, templates){
'#schedule-section-link',
'#favorites-section-link',
'#map-section-link',
'#notifications-section-link'
'#notifications-section-link',
'#menu-section-link'
];
$(mainSections.join(',')).click(appTabClicked);

//map pan and zoom setup
initMapPanZoom();

//update sync time on each dropdown open
$('#app-menu').on('show.bs.dropdown', function(){
var updateInfoContainer = $('#last-sync-menu-header'),
template = templates.last_sync_time;
updateInfoContainer.html(
template({
lastFetchTime: updateInfo.time
})
);
console.log('sync display updated');
});

//developer submenu toggle
$('#developer-submenu-toggle').click(function(e){
var toggleLink = $(this),
Expand Down Expand Up @@ -573,6 +584,7 @@ module.exports = function($, FISLParser, templates){
var timestamp = Date.now();
companionStore.updateXML(feedData, timestamp, function(){
console.log('feed updated locally');
updateMenuSyncMessage();
});
companionStore.getLastFetchInfo(function(info){
console.log('local updateInfo loaded:',info);
Expand Down
6 changes: 6 additions & 0 deletions src/templates/partials/app.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,10 @@
>
{{> map}}
</div>
<div
id="menu-view"
class="app-panel"
>
{{> menu}}
</div>
</div>
83 changes: 2 additions & 81 deletions src/templates/partials/app_menu.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,90 +30,11 @@
{{!-- <span class="badge">2</span> --}}
</a>
</li>
<li class="dropdown navbar-right">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<li id="menu-tab">
<a id="menu-section-link" href="#">
<span class="icon fa-ellipsis-h"></span>
<span class="tab-name">Menu</span>

</a>
<ul id="app-menu" class="dropdown-menu">
<li id="last-sync-menu-header" role="presentation" class="dropdown-header">
{{> last_sync_time}}
</li>
<li>
<a id="refresh-feed">
<span class="icon"></span>
Atualizar programação agora
</a>
</li>
<li class="divider"></li>
<li role="presentation" class="dropdown-header">Modo de exibição</li>
<li class="container">
<div id="list-view-toggle" class="btn-group" data-toggle="buttons">
<label
class="
list-view-button
{{#is schedule_type 'list'}}
active
{{/is}}
btn btn-primary"
>
<input type="radio" name="schedule-view-mode" value="list"
{{#is schedule_type 'list'}}
checked
{{/is}}
>
<span class="icon"></span>
Lista
</label>
<label
class="
table-view-button
{{#is schedule_type 'table'}}
active
{{/is}}
btn btn-primary"
>
<input type="radio" name="schedule-view-mode" value="table"
{{#is schedule_type 'table'}}
checked
{{/is}}
>
<span class="icon"></span>
Tabela
</label>
</div>
</li>
<li class="divider"></li>
<li role="presentation" class="collapse dropdown-header">Versão: {{version}}</li>
<li>
<a
id="developer-submenu-toggle"
class="closed"
data-toggle="collapse"
data-target=".developers-submenu"
>
<span class="icon"></span>
Desenvolvedores
</a>
</li>
<li class="collapse developers-submenu">
<a id="source-code-link" href="https://github.com/TelaSocial/companion" target="_blank">
<span class="icon fa-cogs"></span>
Código fonte
</a>
</li>
<li class="collapse developers-submenu">
<a id="issues-link" href="https://github.com/TelaSocial/companion/issues/new" target="_blank">
<span class="icon fa-bug"></span>
Reportar um bug
</a>
</li>
<li class="collapse developers-submenu"><a id="erase-feed" href="#"><span class="icon fa-eraser"></span> Apagar cache da grade</a></li>
<li class="collapse developers-submenu"><a id="erase-bookmarks" href="#"><span class="icon fa-eraser"></span> Apagar todas as escolhas</a></li>
<li class="collapse developers-submenu"><a id="erase-notifications" href="#"><span class="icon fa-eraser"></span> Apagar todos os avisos</a></li>
<li class="collapse developers-submenu"><a id="erase-all" href="#"><span class="icon fa-fire"></span> Destruir todos os dados locais</a></li>
</ul>
</li>
</ul>
</nav>
79 changes: 79 additions & 0 deletions src/templates/partials/menu.hbs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<h1>Menu</h1>
<div id="app-menu">
<h4 id="last-sync-menu-header">
{{> last_sync_time}}
</h4>
<p>
<a class="refresh-feed btn btn-default btn-primary">
<span class="icon"></span>
Atualizar programação agora
</a>
</p>
<hr />
<h4>Modo de exibição</h4>
<div id="list-view-toggle" class="btn-group" data-toggle="buttons">
<label
class="
list-view-button
{{#is schedule_type 'list'}}
active
{{/is}}
btn btn-primary"
>
<input type="radio" name="schedule-view-mode" value="list"
{{#is schedule_type 'list'}}
checked
{{/is}}
>
<span class="icon"></span>
Lista
</label>
<label
class="
table-view-button
{{#is schedule_type 'table'}}
active
{{/is}}
btn btn-primary"
>
<input type="radio" name="schedule-view-mode" value="table"
{{#is schedule_type 'table'}}
checked
{{/is}}
>
<span class="icon"></span>
Tabela
</label>
</div>
<hr />
<h4>Versão: {{version}}</h4>
<p>
<a
id="developer-submenu-toggle"
class="closed"
data-toggle="collapse"
data-target=".developers-submenu"
>
<span class="icon"></span>
Desenvolvedores
</a>
</p>
<ul>
<li class="collapse developers-submenu">
<a id="source-code-link" href="https://github.com/TelaSocial/companion" target="_blank">
<span class="icon fa-cogs"></span>
Código fonte
</a>
</li>
<li class="collapse developers-submenu">
<a id="issues-link" href="https://github.com/TelaSocial/companion/issues/new" target="_blank">
<span class="icon fa-bug"></span>
Reportar um bug
</a>
</li>
<li class="collapse developers-submenu"><a id="erase-feed" href="#"><span class="icon fa-eraser"></span> Apagar cache da grade</a></li>
<li class="collapse developers-submenu"><a id="erase-bookmarks" href="#"><span class="icon fa-eraser"></span> Apagar todas as escolhas</a></li>
<li class="collapse developers-submenu"><a id="erase-notifications" href="#"><span class="icon fa-eraser"></span> Apagar todos os avisos</a></li>
<li class="collapse developers-submenu"><a id="erase-all" href="#"><span class="icon fa-fire"></span> Destruir todos os dados locais</a></li>
</ul>
</div>

0 comments on commit 13bc5f7

Please sign in to comment.