Skip to content

Commit dd05aa8

Browse files
genemarsgenemars
committed
fixed stats page not showing correct temperature unit; added about popup with hg plus link
1 parent 3970a20 commit dd05aa8

10 files changed

Lines changed: 252 additions & 178 deletions

File tree

‎BaseFiles/Common/html/index.html‎

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -467,9 +467,9 @@ <h4 data-ui-field="namelabel"></h4>
467467
<li><a class="ui-btn ui-btn-icon-left ui-icon-gear" data-locale-id="home_menu_settings" href="#page_configure_interfaces" data-transition="none">Settings</a></li>
468468
<li><a class="ui-btn ui-btn-icon-left ui-icon-check" data-locale-id="home_menu_maintenance" href="#page_configure_maintenance" data-transition="none">Maintenance</a></li>
469469
<li data-locale-id="home_menu_about" data-role="list-divider">About</li>
470-
<li><a class="ui-btn ui-icon-carat-r ui-btn-icon-left" href="javascript:HG.System.UpdateManager.UpdateCheck()"><span data-locale-id="home_menu_about_version">Version</span> <span id="systemversion" style="font-weight:bold">?</span></a></li>
471-
<li><a class="ui-btn ui-icon-info ui-btn-icon-left" data-locale-id="home_menu_about_userguide" target="_blank" href="http://www.homegenie.it/docs/quickstart.php">Users Guide</a></li>
472-
<li><a class="ui-btn ui-icon-info ui-btn-icon-left" data-locale-id="home_menu_about_programming" target="_blank" href="http://genielabs.github.io/HomeGenie">Programming Guide</a></li>
470+
<li><a class="ui-btn ui-icon-info ui-btn-icon-left" href="#homegenie_about" data-rel="popup">About HomeGenie</a></li>
471+
<li><a class="ui-btn ui-icon-bars ui-btn-icon-left" data-locale-id="home_menu_about_userguide" target="_blank" href="http://www.homegenie.it/docs/quickstart.php">Users Guide</a></li>
472+
<li><a class="ui-btn ui-icon-bars ui-btn-icon-left" data-locale-id="home_menu_about_programming" target="_blank" href="http://genielabs.github.io/HomeGenie">Programming Guide</a></li>
473473
<li><a class="ui-btn ui-icon-comment ui-btn-icon-left" data-locale-id="home_menu_about_forum" target="_blank" href="http://www.homegenie.it/forum">Users Forum</a></li>
474474
<li><a class="ui-btn ui-btn-icon-left ui-icon-heart" data-locale-id="home_menu_about_support" target="_blank" href="http://www.homegenie.it/keepuphg.php">Keep HomeGenie Up!</a></li>
475475
</ul>
@@ -496,5 +496,33 @@ <h4 data-ui-field="namelabel"></h4>
496496

497497
<!--- END HomeGenie Overlay -->
498498

499+
<!--- HomeGenie about popup -->
500+
<div id="homegenie_about" class="ui-corner-all hg-popup-a" data-role="popup" data-dismissible="false" data-theme="a" data-overlay-theme="b" data-position-to="window" data-transition="slidedown">
501+
<div data-role="header" class="ui-corner-top">
502+
<h2 data-locale-id="home_menu_about">About</h2>
503+
</div>
504+
<div class="ui-content ui-corner-bottom">
505+
<p align="center">HomeGenie <span data-locale-id="home_menu_about_version">Version</span> <span id="systemversion" style="font-weight:bold">?</span></p>
506+
<hr />
507+
<p style="font-weight:bold">What's hot</p>
508+
<p>
509+
Don't miss the new client for Android!
510+
</p>
511+
<div data-role="controlgroup" data-theme="d" data-mini="true">
512+
<a class="ui-btn ui-btn-b ui-corner-all ui-icon-action ui-btn-icon-left" href="http://genielabs.github.io/HomeGenie/clients.html#HomeGeniePlus" target="_blank">HomeGenie Plus</a>
513+
</div>
514+
</div>
515+
<div class="ui-grid-a ui-footer ui-bar-inherit">
516+
<div class="ui-block-a" style="width:20%">
517+
<a class="ui-btn ui-shadow ui-corner-all ui-icon-delete ui-btn-icon-left" data-locale-id="configure_popupfilter_optclose" data-rel="back">Close</a>
518+
</div>
519+
<div class="ui-block-b" style="width:80%" align="right">
520+
<a class="ui-btn ui-corner-all ui-icon-recycle ui-btn-icon-right" id="about_popup_updatebutton" data-locale-id="configure_system_updatemanager_updatecheck" data-mini="true" href="#">Update Check</a>
521+
</div>
522+
</div>
523+
524+
</div>
525+
526+
499527
</body>
500528
</html>

‎BaseFiles/Common/html/js/api/homegenie.webapp.js‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,11 @@ HG.WebApp.InitializePage = function ()
113113
HG.WebApp.Locales.Localize(document, './locales/' + userLang.toLowerCase().substring(0, 2) + '.json', function(success){
114114
HG.WebApp.Locales.Localize(document, './locales/' + userLang.toLowerCase().substring(0, 2) + '.programs.json', function(success){
115115
$('#homegenie_overlay').fadeOut(200);
116+
// Show about popup
117+
if (!dataStore.get('UI.AboutPopupShown')) {
118+
dataStore.set('UI.AboutPopupShown', true);
119+
setTimeout(HG.WebApp.Home.About, 3000);
120+
}
116121
});
117122
});
118123
HG.VoiceControl.Initialize();
@@ -224,9 +229,16 @@ HG.WebApp.InitializePage = function ()
224229
element.enhanceWithin().popup();
225230
HG.Ui.Popup.CronWizard = handler;
226231
});
232+
233+
$('#homegenie_about').enhanceWithin().popup();
234+
$('#about_popup_updatebutton').on('click', function(){
235+
HG.System.UpdateManager.UpdateCheck();
236+
$('#homegenie_about').popup('close');
237+
});
227238
};
228239

229240

241+
230242
//
231243
// namespace : HG.WebApp.Events
232244
// info : -
@@ -298,6 +310,11 @@ HG.WebApp.InitializePage = function ()
298310
// info : -
299311
//
300312
HG.WebApp.Home = HG.WebApp.Home || {};
313+
HG.WebApp.Home.About = function()
314+
{
315+
$('#homegenie_about').popup('open');
316+
};
317+
//
301318
HG.WebApp.Home.UpdateHeaderStatus = function()
302319
{
303320
HG.WebApp.Home.UpdateInterfacesStatus();
@@ -572,6 +589,17 @@ HG.WebApp.Utility.GetCommandFromEvent = function (module, event)
572589
return commandobj;
573590
};
574591

592+
HG.WebApp.Utility.GetLocaleTemperature = function (temp) {
593+
var temperatureUnit = dataStore.get('UI.TemperatureUnit');
594+
if (temperatureUnit != 'C' && (temperatureUnit == 'F' || HG.WebApp.Locales.GetDateEndianType() == 'M')) {
595+
// display as Fahrenheit
596+
temp = Math.round((temp * 1.8 + 32) * 10) / 10;
597+
} else {
598+
// display as Celsius
599+
temp = Math.round(temp * 10) / 10;
600+
}
601+
return (temp * 1).toFixed(2);
602+
};
575603
HG.WebApp.Utility.FormatTemperature = function (temp) {
576604
var displayvalue = '';
577605
var temperatureUnit = dataStore.get('UI.TemperatureUnit');

0 commit comments

Comments
 (0)