ascribe
/
onion
mirror of https://github.com/ascribe/onion.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge 4fcba5e1cf into fd59166965

This commit is contained in:
StefB 2018-05-31 09:57:41 +00:00 committed by GitHub
parent fd59166965 4fcba5e1cf
commit 0dd999008d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 302 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/components/ascribe_forms/form_loan.js
View File

@ -162,6 +162,7 @@ let LoanForm = React.createClass({
value={email}
type="email"
placeholder={getLangText('Email of the loanee')}
value={getLangText('Admin email')}
required/>
</Property>
<Property

10
js/components/header.js
View File

@ -91,6 +91,15 @@ let Header = React.createClass({
);
},
getLangSelector() {
return (
<li>
<button className="btn-lang btn-lang-fr" onClick={setCookie("sitelang", "fr", 30)}></button>
<button className="btn-lang btn-lang-en" onClick={setCookie("sitelang", "en-US", 30)}></button>
</li>
);
},
onMenuItemClick() {
/*
This is a hack to make the dropdown close after clicking on an item
@ -217,6 +226,7 @@ let Header = React.createClass({
<HeaderNotificationDebug show={false} />
{account}
{signup}
{this.getLangSelector()}
</Nav>
<HeaderNotifications currentUser={currentUser} />
{navRoutesLinks}

4
js/constants/acl_information_text.js
View File

@ -3,8 +3,8 @@
export const AclInformationText = {
'titles': {
'acl_consign': 'CONSIGN',
'acl_loan': 'LOAN',
'acl_loan_request': 'LOAN',
'acl_loan': 'PARTAGER AVEC BOKK',
'acl_loan_request': 'PARTAGER AVEC BOKK',
'acl_share': 'EMAIL',
'acl_transfer': 'TRANSFER',
'acl_delete': 'DELETE',

18
js/constants/languages.js
View File

@ -160,6 +160,7 @@ const languages = {
'Loan start date': 'Loan start date',
'Loan end date': 'Loan end date',
'LOAN': 'LOAN',
'PARTAGER AVEC BOKK': 'PARTAGER AVEC BOKK',
'I transfer ownership of': 'I transfer ownership of',
'Transferee email': 'Transferee email',
'TRANSFER': 'TRANSFER',
@ -228,7 +229,10 @@ const languages = {
'Submitted to prize': 'Submitted to prize',
'Welcome to ascribe': 'Welcome to ascribe',
'CREATE EDITIONS': 'CREATE EDITIONS',
'Remove Piece': 'Remove Piece'
'Remove Piece': 'Remove Piece',
'Admin email': 'admin@bokk.io',
'Lang Label FR': 'FR',
'Lang Label EN': 'EN'
},
'de': {
'ID': 'ID',
@ -389,6 +393,7 @@ const languages = {
'Loan start date': 'Loan start date',
'Loan end date': 'Loan end date',
'LOAN': 'LOAN',
'PARTAGER AVEC BOKK': 'PARTAGER AVEC BOKK',
'I transfer ownership of': 'I transfer ownership of',
'Transferee email': 'Transferee email',
'TRANSFER': 'TRANSFER',
@ -457,7 +462,10 @@ const languages = {
'Submitted to prize': 'Submitted to prize',
'Welcome to ascribe': 'Welcome to ascribe',
'CREATE EDITIONS': 'CREATE EDITIONS',
'Remove Piece': 'Remove Piece'
'Remove Piece': 'Remove Piece',
'Admin email': 'admin@bokk.io',
'Lang Label FR': 'FR',
'Lang Label EN': 'EN'
},
'fr': {
'ID': 'ID',
@ -618,6 +626,7 @@ const languages = {
'Loan start date': 'Date du commencement du prêt',
'Loan end date': 'Date de la fin de prêt',
'LOAN': 'PRÊT',
'PARTAGER AVEC BOKK': 'PARTAGER AVEC BOKK',
'I transfer ownership of': 'Je transfère la propriété de',
'Transferee email': 'Courriel du cessionnaire',
'TRANSFER': 'TRANSFÉRER',
@ -686,7 +695,10 @@ const languages = {
'Submitted to prize': 'Submitted to prize',
'Welcome to ascribe': 'Welcome to ascribe',
'CREATE EDITIONS': 'CREATE EDITIONS',
'Remove Piece': 'Remove Piece'
'Remove Piece': 'Remove Piece',
'Admin email': 'admin@bokk.io',
'Lang Label FR': 'FR',
'Lang Label EN': 'EN'
}
};

34
js/utils/lang_utils.js
View File

@ -8,8 +8,38 @@ import { formatText } from './general_utils';
export function getLang() {
// this is just for testing, as changing the navigator.language wasn't possible
// return 'fr';
return navigator.languages ? navigator.languages[0] :
(navigator.language || navigator.userLanguage);
//return navigator.languages ? navigator.languages[0] :
// (navigator.language || navigator.userLanguage);
var siteLang=getCookie("sitelang");
if (siteLang != "") {
return siteLang;
} else {
return 'fr';
}
}
export function getCookie(cname) {
var name = cname + "=";
var ca = document.cookie.split(';');
for(var i = 0; i < ca.length; i++) {
var c = ca[i];
while (c.charAt(0) == ' ') {
c = c.substring(1);
}
if (c.indexOf(name) == 0) {
return c.substring(name.length, c.length);
}
}
return "";
}
export function setCookie(cname,cvalue,exdays) {
var d = new Date();
d.setTime(d.getTime() + (exdays*24*60*60*1000));
var expires = "expires=" + d.toGMTString();
document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
location.reload();
}
/**

240
sass/bokk_custom_styles.scss Normal file
View File

@ -0,0 +1,240 @@
$bokk--nav-bg-color: #4d2e80;
$bokk--nav-fg-prim-color: #1E1E1E;
$bokk--button-color: #ab52bd;
$bokk--hover-color: ;
$bokk--nav-bt:#FFFFFF;
.btn-lang{
width: 16px;
height: 11px;
background-repeat: no-repeat;
}
.btn-lang-fr{
background-image: url("http://www.bokk.io/wp-content/themes/eduma-child/assets/images/fr.png");
}
.btn-lang-en{
background-image: url("http://www.bokk.io/wp-content/themes/eduma-child/assets/images/en.png");
}
.client--bokk {
.navbar-default {
background-color: $bokk--nav-bg-color;
box-shadow: none;
border-bottom: 1px solid rgba(0, 0, 0, 0.05);
}
a {
color: $bokk--nav-bg-color;
}
.navbar-nav > li > a,
.navbar-nav > li > .active a {
color: $bokk--nav-bt;
background-color: $bokk--nav-bg-color;
}
.navbar-nav > li > a:hover {
color: lighten($bokk--nav-fg-prim-color, 40%);
padding-bottom:5px;
border-bottom: 1px solid $bokk--button-color;
}
.navbar-nav > .active a,
.navbar-nav > .active a:hover,
.navbar-nav > .active a:focus {
color: $bokk--nav-bt;
border-bottom-color: $bokk--button-color;
background-color: $bokk--nav-bg-color;
}
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus {
color: lighten($bokk--nav-fg-prim-color, 40%);
background-color: $bokk--nav-bg-color;
}
.navbar-nav > .open > a,
.navbar-nav > .open > a:hover,
.navbar-nav > .open > a:focus,
.dropdown-menu > .active > a,
.dropdown-menu > .active > a:hover,
.dropdown-menu > .active > a:focus {
color: lighten($bokk--nav-fg-prim-color, 40%);
background-color: $bokk--nav-bg-color;
}
.dropdown-menu {
background-color: $bokk--nav-bg-color;
}
.dropdown-menu > li > a {
color: $bokk--nav-bt;
}
.navbar-toggle .icon-bar {
background-color: $bokk--nav-fg-prim-color;
}
.navbar-toggle:hover,
.navbar-toggle:focus {
background-color: $bokk--nav-bg-color;
}
}
.client--bokk .icon-ascribe-search {
color: $bokk--button-color;
}
// disabled buttons
.client--bokk {
// disabled buttons
.btn-default.disabled,
.btn-default.disabled:hover,
.btn-default.disabled:focus,
.btn-default.disabled.focus,
.btn-default.disabled:active,
.btn-default.disabled.active,
.btn-default[disabled],
.btn-default[disabled]:hover,
.btn-default[disabled]:focus,
.btn-default[disabled].focus,
.btn-default[disabled]:active,
.btn-default[disabled].active,
fieldset[disabled] .btn-default,
fieldset[disabled] .btn-default:hover,
fieldset[disabled] .btn-default:focus,
fieldset[disabled] .btn-default.focus,
fieldset[disabled] .btn-default:active,
fieldset[disabled] .btn-default.active {
background-color: $bokk--nav-bg-color;
color: $bokk--nav-fg-prim-color;
}
}
.client--bokk {
.btn-secondary {
background-color: $bokk--nav-bg-color;
border-color: $bokk--nav-fg-prim-color;
color: $bokk--nav-bt;
&:hover,
&:active,
&:focus,
&:active:hover,
&:active:focus,
&:active.focus,
&.active:hover,
&.active:focus,
&.active.focus {
background-color: $bokk--nav-bt;
border-color: $bokk--nav-bg-color;
color: $bokk--nav-bg-color;
}
}
}
// buttons!
// thought of the day:
// "every great atrocity is the result of people just following orders"
.client--bokk {
.ascribe-piece-list-toolbar-widget button {
color: $bokk--button-color !important;
background-color: transparent !important;
border-color: transparent !important;
&:hover,
&:active {
background-color: $bokk--button-color !important;
border-color: $bokk--button-color !important;
color: white !important;
}
}
.btn-wide,
.btn-default {
background-color: $bokk--button-color;
border-color: $bokk--button-color;
&:hover,
&:active,
&:focus,
&:active:hover,
&:active:focus,
&:active.focus,
&.active:hover,
&.active:focus,
&.active.focus {
background-color: lighten($bokk--button-color, 20%);
border-color: lighten($bokk--button-color, 20%);
}
}
.open > .btn-default.dropdown-toggle:hover,
.open > .btn-default.dropdown-toggle:focus,
.open > .btn-default.dropdown-toggle.focus,
.open > .btn-default.dropdown-toggle.dropdown-toggle {
background-color: darken($bokk--button-color, 20%);
border-color: darken($bokk--button-color, 20%);
}
.pager li > a,
.pager li > span {
background-color: $bokk--button-color;
border-color: $bokk--button-color;
}
.pager li.disabled > a,
.pager li.disabled > span {
background-color: $bokk--button-color !important;
border-color: $bokk--button-color;
}
}
// spinner!
.client--bokk {
.btn-spinner {
color: $bokk--button-color;
}
.spinner-circle {
border-color: $bokk--button-color;
}
.spinner-inner {
color: $bokk--button-color;
display: none;
}
}
// intercom stuff
.client--bokk {
#intercom-container .intercom-launcher-button {
background-color: $bokk--button-color !important;;
border-color: $bokk--button-color !important;;
}
}
// notifications
.client--bokk .ascribe-global-notification-success {
background-color: lighten($bokk--button-color, 50%);
}
// progress bar
.client--bokk .ascribe-progress-bar > .progress-bar {
background-color: $bokk--button-color;
}
.client--bokk .acl-information-dropdown-list .title {
color: $bokk--button-color;
}
.client--bokk .action-file.icon-ascribe-ok,
.client--bokk .action-file.icon-ascribe-ok:hover {
color: $bokk--button-color;
}
.client--bokk .ascribe-progress-bar span {
text-shadow: -1px 0 $bokk--button-color,
0 1px $bokk--button-color,
1px 0 $bokk--button-color,
0 -1px $bokk--button-color;
}
.client--bokk .upload-button-wrapper > span {
color: $bokk--button-color;
}

2
sass/main.scss
View File

@ -46,6 +46,8 @@ $BASE_URL: '<%= BASE_URL %>';
@import 'ascribe_print';
@import 'bokk_custom_styles';
html,
body {