l10n typos & CSS fixes
This commit is contained in:
@@ -20,6 +20,7 @@ class Spot extends Main
|
|||||||
const POST_TABLE = 'posts';
|
const POST_TABLE = 'posts';
|
||||||
|
|
||||||
const FEED_CHUNK_SIZE = 15;
|
const FEED_CHUNK_SIZE = 15;
|
||||||
|
const MAIL_CHUNK_SIZE = 5;
|
||||||
|
|
||||||
const DEFAULT_LANG = 'en';
|
const DEFAULT_LANG = 'en';
|
||||||
|
|
||||||
@@ -198,7 +199,7 @@ class Spot extends Main
|
|||||||
$oEmail->oTemplate->setInstanceTag($asPost['type'], 'local_server', $this->asContext['serv_name']);
|
$oEmail->oTemplate->setInstanceTag($asPost['type'], 'local_server', $this->asContext['serv_name']);
|
||||||
$iPostCount++;
|
$iPostCount++;
|
||||||
}
|
}
|
||||||
if($iPostCount==5) break;
|
if($iPostCount == self::MAIL_CHUNK_SIZE) break;
|
||||||
}
|
}
|
||||||
|
|
||||||
$oEmail->send();
|
$oEmail->send();
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ unit_hour = h
|
|||||||
newsletter = Rester en contact
|
newsletter = Rester en contact
|
||||||
nl_email_placeholder= mon@email.com
|
nl_email_placeholder= mon@email.com
|
||||||
nl_invalid_email = Ceci ne ressemble pas à une adresse email
|
nl_invalid_email = Ceci ne ressemble pas à une adresse email
|
||||||
nl_subscribed_desc = C'est tout bon. On t'enverra les nouvelles posititions dès qu'on les reçoit
|
nl_subscribed_desc = C'est tout bon. On t'envoie des nouvelles fraiches dès qu'on les reçoit. Parole de scout.
|
||||||
nl_unsubscribed_desc= Ajoute ton adresse email et on t'enverra la nouvelle position de François dès qu'on la reçoit :)
|
nl_unsubscribed_desc= Ajoute ton adresse email et on t'enverra la nouvelle position de François dès qu'on la reçoit :)
|
||||||
nl_email_exists = Cette adresse email est déjà enregistrée. Vous pouvez vous désinscrire en cliquant sur le bouton ci-dessus.
|
nl_email_exists = Cette adresse email est déjà enregistrée. Vous pouvez vous désinscrire en cliquant sur le bouton ci-dessus.
|
||||||
nl_subscribe = S'abonner
|
nl_subscribe = S'abonner
|
||||||
|
|||||||
@@ -221,15 +221,18 @@ function initProject(sProjectCodeName){
|
|||||||
}
|
}
|
||||||
|
|
||||||
function initPosts() {
|
function initPosts() {
|
||||||
|
//Add post form
|
||||||
var asPoster = {
|
var asPoster = {
|
||||||
type: 'poster',
|
type: 'poster',
|
||||||
formatted_time: '',
|
formatted_time: '',
|
||||||
relative_time: oSpot.lang('post_new_message')
|
relative_time: oSpot.lang('post_new_message')
|
||||||
};
|
};
|
||||||
getPost(asPoster).appendTo($('#poster'));
|
$('#poster').append(getPost(asPoster));
|
||||||
|
|
||||||
|
//Auto-adjust text area height
|
||||||
autosize($('#post'));
|
autosize($('#post'));
|
||||||
|
|
||||||
|
//Add post Event handling
|
||||||
$('#submit').click(function(){
|
$('#submit').click(function(){
|
||||||
if($('#poster').checkForm())
|
if($('#poster').checkForm())
|
||||||
{
|
{
|
||||||
@@ -641,7 +644,7 @@ function updateFeed(bFirstChunk, bDiscrete) {
|
|||||||
|
|
||||||
self.tmp('updatable', true);
|
self.tmp('updatable', true);
|
||||||
|
|
||||||
if(bFirstChunk && !isMobile() && !$.isEmptyObject(asData)) toggleFeedPanel(true, 'none');
|
if(bFirstChunk && !isMobile() && !$.isEmptyObject(asData) && !bDiscrete) toggleFeedPanel(true, 'none');
|
||||||
}, {
|
}, {
|
||||||
'project_id': self.vars(['project', 'id']),
|
'project_id': self.vars(['project', 'id']),
|
||||||
'chunk': self.tmp('news_chunk')
|
'chunk': self.tmp('news_chunk')
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ $stroke-width-axis : 2;
|
|||||||
text-shadow: 0px 1px 1px rgba(0,0,0,0.8);
|
text-shadow: 0px 1px 1px rgba(0,0,0,0.8);
|
||||||
width: 44px;
|
width: 44px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
box-shadow: none;
|
||||||
|
|
||||||
.fa, .heightgraph-toggle-icon {
|
.fa, .heightgraph-toggle-icon {
|
||||||
@extend .control-icon;
|
@extend .control-icon;
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ $legend-color: $post-color;
|
|||||||
}
|
}
|
||||||
|
|
||||||
.leaflet-right {
|
.leaflet-right {
|
||||||
width: calc(#{$panel-width});
|
width: $panel-width;
|
||||||
max-width: calc(#{$panel-width-max});
|
max-width: calc(#{$panel-width-max});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -54,7 +54,7 @@ $legend-color: $post-color;
|
|||||||
}
|
}
|
||||||
|
|
||||||
.leaflet-left {
|
.leaflet-left {
|
||||||
width: calc(#{$panel-width});
|
width: $panel-width;
|
||||||
max-width: calc(#{$panel-width-max});
|
max-width: calc(#{$panel-width-max});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -131,6 +131,7 @@ $legend-color: $post-color;
|
|||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
border: none;
|
border: none;
|
||||||
margin: $block-spacing;
|
margin: $block-spacing;
|
||||||
|
box-shadow: 0 1px 7px rgba(0, 0, 0, .4);
|
||||||
|
|
||||||
&+ .leaflet-control {
|
&+ .leaflet-control {
|
||||||
margin-top: 0;
|
margin-top: 0;
|
||||||
@@ -248,8 +249,6 @@ $legend-color: $post-color;
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
width: calc(#{$panel-width});
|
|
||||||
max-width: calc(#{$panel-width-max});
|
|
||||||
z-index: -1;
|
z-index: -1;
|
||||||
transition-property: z-index;
|
transition-property: z-index;
|
||||||
transition-duration: 0.1s;
|
transition-duration: 0.1s;
|
||||||
@@ -273,6 +272,8 @@ $legend-color: $post-color;
|
|||||||
}
|
}
|
||||||
#feed {
|
#feed {
|
||||||
right: 0;
|
right: 0;
|
||||||
|
width: #{$panel-width};
|
||||||
|
max-width: calc(#{$panel-width-max});
|
||||||
|
|
||||||
#posts {
|
#posts {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
@@ -444,11 +445,13 @@ $legend-color: $post-color;
|
|||||||
}
|
}
|
||||||
#settings {
|
#settings {
|
||||||
left: 0;
|
left: 0;
|
||||||
|
width: calc(#{$panel-width} + 3px); //Add box-shadow
|
||||||
|
max-width: calc(#{$panel-width-max} + 3px); //Add box-shadow
|
||||||
|
|
||||||
#settings-sections {
|
#settings-sections {
|
||||||
width: calc(100% - 3rem);
|
width: calc(100% - 3rem - 3px); //Remove box-shadow
|
||||||
margin: 1rem;
|
margin: $block-spacing;
|
||||||
padding: 1rem;
|
padding: $block-spacing;
|
||||||
background: white;
|
background: white;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
box-shadow: 2px 2px 3px 0px rgba(0,0,0,.5);
|
box-shadow: 2px 2px 3px 0px rgba(0,0,0,.5);
|
||||||
@@ -466,7 +469,7 @@ $legend-color: $post-color;
|
|||||||
margin-top: 1.5rem;
|
margin-top: 1.5rem;
|
||||||
|
|
||||||
h1 {
|
h1 {
|
||||||
margin: 0 0 1rem;
|
margin: 0 0 $block-spacing;
|
||||||
}
|
}
|
||||||
|
|
||||||
label {
|
label {
|
||||||
@@ -476,7 +479,7 @@ $legend-color: $post-color;
|
|||||||
}
|
}
|
||||||
|
|
||||||
&.title {
|
&.title {
|
||||||
margin: -1rem -1rem 0 -1rem;
|
margin: -#{$block-spacing} -#{$block-spacing} 0 -#{$block-spacing};
|
||||||
width: calc(100% + 2rem);
|
width: calc(100% + 2rem);
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|
||||||
@@ -568,8 +571,8 @@ $legend-color: $post-color;
|
|||||||
a {
|
a {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|
||||||
margin-right: 1rem;
|
margin-right: $block-spacing;
|
||||||
margin-top: 1rem;
|
margin-top: $block-spacing;
|
||||||
&:last-child {
|
&:last-child {
|
||||||
margin-right: 0;
|
margin-right: 0;
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user