diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/bootstrap-red.css | 4 | ||||
| -rw-r--r-- | view/css/conversation.css | 7 | ||||
| -rw-r--r-- | view/fr/invite.formal.tpl | 2 | ||||
| -rw-r--r-- | view/js/mod_cloud.js | 3 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 6 | ||||
| -rw-r--r-- | view/tpl/admin_site.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/settings_account.tpl | 3 |
7 files changed, 12 insertions, 21 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index b0bd4fd75..f1296d7b2 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -65,7 +65,3 @@ label { a { text-decoration: none !important; } - -.mark { - background-color: yellow; -} diff --git a/view/css/conversation.css b/view/css/conversation.css index 97d7857cc..d6a99f853 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -94,7 +94,6 @@ /* conversation */ - /* conv_item */ .wall-item-head-new { @@ -220,12 +219,6 @@ a.wall-item-name-link { border-left: 0.2rem solid #007bff; } -.item-highlight .wall-item-head, -.item-highlight .wall-item-content, -.item-highlight .wall-item-tools { - padding-left: 0.3rem; -} - /* comment_item */ diff --git a/view/fr/invite.formal.tpl b/view/fr/invite.formal.tpl index 404059af6..5d4d34caa 100644 --- a/view/fr/invite.formal.tpl +++ b/view/fr/invite.formal.tpl @@ -1,6 +1,6 @@ {{* tpl FR formel, pour inviter de manière plus polie des personnes comme des membres d'entreprise ou des partenaires professionnels *}}. -Veuillez rejoindre le réseau social {{$nom du projet}}. Ce message contient les données essentielles pour la première connexion. +Veuillez rejoindre le réseau social {{$projectname}}. Ce message contient les données essentielles pour la première connexion. Le site est à rejoindre se trouve ici : {{$invite_whereami}} diff --git a/view/js/mod_cloud.js b/view/js/mod_cloud.js index 7f9cb4fd1..e0f59beab 100644 --- a/view/js/mod_cloud.js +++ b/view/js/mod_cloud.js @@ -411,6 +411,9 @@ function UploadInit() { var filedrag = $(".cloud-index.attach-drop"); var reload = false; + if (!$('#invisible-cloud-file-upload').length) + return; + $('#invisible-cloud-file-upload').fileupload({ url: 'file_upload', dataType: 'json', diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 20309b709..9069500d9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -13,6 +13,7 @@ --bs-link-color: $link_colour; --bs-link-hover-color: $link_hover_colour; --bs-body-bg: $bgcolour; + --bs-highlight-bg: yellow; } .nav-tabs { @@ -1790,11 +1791,6 @@ dl.bb-dl > dd > li { opacity: 1; } -/* default highlighted text if not specified by schema: */ -span.default-highlight { - background-color: yellow; -} - .bootstrap-tagsinput { width: 100%; } diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index fa942baff..bad68361b 100644 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -20,7 +20,7 @@ {{include file="field_input.tpl" field=$frontpage}} {{include file="field_checkbox.tpl" field=$mirror_frontpage}} {{include file="field_checkbox.tpl" field=$login_on_homepage}} - {{include file="field_checkbox.tpl" field=$enable_context_help}} + {{** include file="field_checkbox.tpl" field=$enable_context_help **}} {{if $directory_server}} {{include file="field_select.tpl" field=$directory_server}} {{/if}} @@ -72,10 +72,10 @@ {{include file="field_input.tpl" field=$proxy}} {{include file="field_input.tpl" field=$proxyuser}} {{include file="field_input.tpl" field=$timeout}} - {{include file="field_input.tpl" field=$delivery_interval}} + {{**include file="field_input.tpl" field=$delivery_interval**}} {{include file="field_input.tpl" field=$delivery_batch_count}} - {{include file="field_input.tpl" field=$force_queue}} - {{include file="field_input.tpl" field=$poll_interval}} + {{**include file="field_input.tpl" field=$force_queue**}} + {{**include file="field_input.tpl" field=$poll_interval**}} {{include file="field_input.tpl" field=$maxloadavg}} {{include file="field_input.tpl" field=$default_expire_days}} {{include file="field_input.tpl" field=$active_expire_days}} diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index c81f1abbb..2b942d694 100644 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -8,6 +8,9 @@ <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <div class="section-content-tools-wrapper"> {{include file="field_input.tpl" field=$email}} + {{if $email_hidden}} + <input type='hidden' name='email' value='{{$email_hidden}}'> + {{/if}} {{include file="field_password.tpl" field=$origpass}} {{include file="field_password.tpl" field=$password1}} {{include file="field_password.tpl" field=$password2}} |