From 475b7372ea107f947ab3828bde2ecca2c0ddd4a4 Mon Sep 17 00:00:00 2001 From: franzz Date: Sun, 16 Aug 2015 23:47:00 +0200 Subject: [PATCH] settings --- inc/functions.php | 3 ++- inc/settings.php | 6 ++++++ index.php | 6 ++---- masks/index.html | 11 ++++++----- script/film.js | 25 +++++++++++++++++-------- style/big_screen.css | 7 +++++++ style/{style.css => ugc.css} | 1 + 7 files changed, 41 insertions(+), 18 deletions(-) create mode 100644 inc/settings.php create mode 100644 style/big_screen.css rename style/{style.css => ugc.css} (99%) diff --git a/inc/functions.php b/inc/functions.php index 28e6160..15408ef 100755 --- a/inc/functions.php +++ b/inc/functions.php @@ -1,7 +1,8 @@ - - - - - + + + + + + UGC Clone diff --git a/script/film.js b/script/film.js index fb0b2bc..ddbd960 100755 --- a/script/film.js +++ b/script/film.js @@ -67,6 +67,11 @@ function Film() } }; + this.removeSpinner = function() + { + this.anchor().find('.timetable').removeClass('fa fa-fw fa-spinner fa-spin'); + } + this.anchor = function() { if(Object.keys(this._anchor).length > 0) return this._anchor; @@ -162,6 +167,12 @@ function Affiche(oDate) this.consts = { days:["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"], months:["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]}; + this.isLoaded = function() + { + //TODO + return true; + }; + this.loadCinemas = function() { //Today timestamp @@ -170,12 +181,12 @@ function Affiche(oDate) $.each(asCinemas, function(iCinemaId, sCinemaName){ getUgcPage( 'filmsAjaxAction!getFilmsForPageCinema.action', {cinemaId:iCinemaId, cinemaCode:'', page:'7', filmId:'', filmId_widget:'', '_':Date.now()}, - self.addCinema, + function(hDom){self.addCinema(iCinemaId, hDom)}, 'html'); }); }; - this.addCinema = function(hDom) + this.addCinema = function(iCinemaId, hDom) { var $Page = $(hDom); var $Films = $Page.find('.FilmDiv'); @@ -183,7 +194,6 @@ function Affiche(oDate) { var $Film = $(this); var iFilmId = $Film.find('input[name="filmId"]').val(); - var iCinemaId = $Film.find('input[name="cinemaId"]').val(); var oFilm = self.film(iFilmId); if(!oFilm) @@ -222,16 +232,15 @@ function Affiche(oDate) getUgcPage( 'filmsAfficheAction!loadDatesList.action', {filmId:oFilm.id(), cinemaId:iCinemaId, cinemaCode:'', day:''}, function(jData){ - var sDate = jData.dates[self.date.timestamp]; if(!(self.date.timestamp in jData.dates)) { self.error('No times today for "'+oFilm.name()+'" @'+asCinemas[iCinemaId]+' (first date available: '+jData.dates[Object.keys(jData.dates)[0]]+')'); - oFilm.anchor().find('.timetable').removeClass('fa fa-fw fa-spinner fa-spin'); + if(self.isLoaded()) oFilm.removeSpinner(); } else { getUgcPage( 'filmsAfficheAction!reloadSeancesList.action', - {filmId:jData.filmId, cinemaId:jData.cinemaId, cinemaCode:'', day:self.date.timestamp}, + {filmId:oFilm.id(), cinemaId:iCinemaId, cinemaCode:'', day:self.date.timestamp}, function(hData){ var sLang = ''; var asLangs = []; @@ -249,13 +258,13 @@ function Affiche(oDate) $Div.find('a').each(function(iKey, oLink){ var $Time = $(oLink); oTime = {'time':$.trim($Time.find('span').text()), 'booking':oFilm.consts.ugc_url+$Time.attr('href')}; - oFilm.timetable(jData.cinemaId, sLang, oTime); + oFilm.timetable(iCinemaId, sLang, oTime); }); } }); asLangs.push(sLang); oFilm.renderTimetable(iCinemaId, asLangs); - oFilm.anchor().find('.timetable').removeClass('fa fa-fw fa-spinner fa-spin'); + if(self.isLoaded()) oFilm.removeSpinner(); }, 'html'); } diff --git a/style/big_screen.css b/style/big_screen.css new file mode 100644 index 0000000..babd0f3 --- /dev/null +++ b/style/big_screen.css @@ -0,0 +1,7 @@ +@media (min-width: 40.5em) { + body { + max-width: 50em; + min-width: 40.5em; + margin: 0px auto; + } +} \ No newline at end of file diff --git a/style/style.css b/style/ugc.css similarity index 99% rename from style/style.css rename to style/ugc.css index f849be2..9a93ce4 100755 --- a/style/style.css +++ b/style/ugc.css @@ -9,6 +9,7 @@ body { font-size: 1em; color:#333; background:#DDD; + min-width: 30em; } a {