franzz/ugc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: franzz:863e2069b59de726f9e5654fcf3eecdfdcdd264e
Branches Tags
franzz:master
...
compare: franzz:master
Branches Tags
franzz:master

7 Commits
863e2069b5 ... master

Author SHA1 Message Date
Franzz
7ccd0279ab Fix Cookie default value 2020-08-30 17:18:12 +02:00
Franzz
3b23d358a0 Fix cookie sameSite attribute 2020-08-30 17:03:24 +02:00
Franzz
187ea6c970 Fix settings panel display 2020-08-30 16:54:27 +02:00
Franzz
2799d2bb86 Add credits 2020-08-25 20:05:48 +02:00
Franzz
ca72365f6d Fix Director's name 2020-08-25 18:03:12 +02:00
Franzz
c7cc14effc Merge branch 'master' of ssh://git@git.lutran.fr:2244/franzz/ugc.git 2020-04-17 11:40:24 +02:00
Franzz
e165581dc7 Adding default timezone 2020-04-17 11:38:50 +02:00
8 changed files with 134 additions and 131 deletions
Expand all files Collapse all files

1
inc/settings.php
View File

@@ -3,4 +3,5 @@
class Settings class Settings
{ {
const DEBUG = false; const DEBUG = false;
const TIMEZONE = 'Europe/Paris';
} }

2
masks/index.html
View File

@@ -35,7 +35,7 @@
<h2><i class="fa inline fa-feedback"></i>Filtered films</h2> <h2><i class="fa inline fa-feedback"></i>Filtered films</h2>
<div id="feed_content"></div> <div id="feed_content"></div>
</div> </div>
<footer><i class="fa inline fa-power"></i>Designed &amp; powered by Franzz, licensed under GPLv3.</footer> <footer><i class="fa inline fa-power"></i>Designed &amp; powered by Franzz, <a href="https://git.lutran.fr/franzz/ugc" title="Git Repository" target="_blank">licensed under GPLv3</a>.</footer>
<div class="background"></div> <div class="background"></div>
<div id="settings"> <div id="settings">
<h1>Theaters<span id="ok_settings" class="button no_bg square fa fa-ok"></span></h1> <h1>Theaters<span id="ok_settings" class="button no_bg square fa fa-ok"></span></h1>

8
script/jquery.js vendored
View File

File diff suppressed because one or more lines are too long

17
script/ugc.js
View File

@@ -427,7 +427,7 @@ function Ugc()
oFilm.trailer(''); oFilm.trailer('');
//Director //Director
oFilm.director($.trim($Film.find('.movie-realisator').text().substring(4))); //omg oFilm.director($.trim($Film.find('.movie-realisator').text().trim().substring(3))); //omg
//Minimum info acquired: book place on DOM //Minimum info acquired: book place on DOM
oFilm.anchor(); oFilm.anchor();
@@ -522,7 +522,8 @@ function Settings()
//Default cinemas //Default cinemas
var asCookieCinemas = Cookies.getJSON('cinemas'); var asCookieCinemas = Cookies.getJSON('cinemas');
this.cinemas(asCookieCinemas?asCookieCinemas:{'10':'Les Halles', '12':'Bercy', '20':'La Défense'}); asCookieCinemas = $.isEmptyObject(asCookieCinemas)?{'10':'Les Halles', '12':'Bercy', '20':'La Défense'}:asCookieCinemas;
this.cinemas(asCookieCinemas);
//UGC cinemas //UGC cinemas
getUgcPage( 'resaExpressAction!getCinemaList.action', getUgcPage( 'resaExpressAction!getCinemaList.action',
@@ -553,8 +554,8 @@ function Settings()
else if($.isNumeric(asCinemas)) return this._ugcCinemas[asCinemas]; //Get Cinema name else if($.isNumeric(asCinemas)) return this._ugcCinemas[asCinemas]; //Get Cinema name
else else
{ {
$.each(asCinemas, function(iCinemaId, sCinema){ $.each(asCinemas, function(iKey, sCinema){
self._ugcCinemas[iCinemaId] = $.trim(sCinema.replace(/UGC( Ciné Cité|)/i, '')); self._ugcCinemas[sCinema.cinemaId] = $.trim(sCinema.cinemaName.replace(/UGC( Ciné Cité|)/i, ''));
}); });
} }
}; };
@@ -640,11 +641,11 @@ function Settings()
//event //event
$Select.change(function(){ $Select.change(function(){
Cookies.set('date', $(this).val(), {expires:6}); Cookies.set('date', $(this).val(), {expires:6, sameSite: 'lax'});
reload(); reload();
}); });
$List.find('.day').click(function(){ $List.find('.day').click(function(){
Cookies.set('date', $(this).data('timestamp'), {expires:6}); Cookies.set('date', $(this).data('timestamp'), {expires:6, sameSite: 'lax'});
reload(); reload();
}); });
}; };
@@ -678,8 +679,8 @@ function Settings()
var $Cine = $(oCinema); var $Cine = $(oCinema);
asCines[$Cine.data('id')] = $Cine.text(); asCines[$Cine.data('id')] = $Cine.text();
}); });
Cookies.set('cinemas', asCines); Cookies.set('cinemas', asCines, {sameSite: 'lax'});
Cookies.set('premiere', self.premiere()?'true':'false'); Cookies.set('premiere', self.premiere()?'true':'false', {sameSite: 'lax'});
reload(); reload();
}); });
}; };

2
style/scss.bat
View File

@@ -1 +1 @@
sass --unix-newline -l --style=compressed --watch ugc.scss:ugc.css sass --style=compressed --watch ugc.scss:ugc.css

3
style/ugc.css
View File

File diff suppressed because one or more lines are too long

8
style/ugc.css.map
View File

File diff suppressed because one or more lines are too long

8
style/ugc.scss
View File

@@ -358,6 +358,14 @@ footer {
font-size: 0.8em; font-size: 0.8em;
margin: 1em 0 0 0; margin: 1em 0 0 0;
color: $ugc_color; color: $ugc_color;
a {
color: $ugc_color;
&:hover {
color: $comp_color;
}
}
} }
/* Section - Settings */ /* Section - Settings */