diff --git a/core/src/plugins/access.ajxp_home/res/home.css b/core/src/plugins/access.ajxp_home/res/home.css index 38ab4e07fa..6b2c3575e9 100644 --- a/core/src/plugins/access.ajxp_home/res/home.css +++ b/core/src/plugins/access.ajxp_home/res/home.css @@ -277,7 +277,6 @@ text-align: center; font-size: 34px; color: white; - margin: 20px; line-height: 55px; opacity: 0; transition: opacity ease 0.9s; @@ -285,51 +284,115 @@ top: 30px; } #home_account_pane #ws_legend .repoInfoBadge { + -webkit-animation: fadein 0.2s ease-in; + animation: fadein 0.2s ease-in; position: relative; + box-sizing: border-box; display: inline-block; - font-size: 24px; - min-width: 210px; - max-width: 210px; - line-height: 30px; - background-color: rgba(0, 0, 0, 0.16); + font-size: 20px; + width: 160px; + line-height: 25px; + background-color: rgba(0, 150, 136, 0.76); border-radius: 3px; - padding: 6px 16px 6px 14px; - margin: 26px 8px; - min-height: 106px; + padding: 0; + margin: 3px; + min-height: 114px; vertical-align: top; text-align: left; clear: both; + color: #ffffff; + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); } #home_account_pane #ws_legend .repoInfoBadge > div { clear: both; } -#home_account_pane #ws_legend .repoInfoBox { +#home_account_pane #ws_legend .repoInfoBadge:nth-child(1) { + background-color: rgba(96, 125, 139, 0.85); +} +#home_account_pane #ws_legend .repoInfoBadge:nth-child(2) { + background-color: rgba(33, 150, 243, 0.85); +} +#home_account_pane #ws_legend .repoInfoBadge:nth-child(3) { + background-color: rgba(244, 67, 54, 0.75); +} +#home_account_pane #ws_legend .repoInfoBadge:nth-child(4) { + background-color: rgba(0, 150, 136, 0.85); +} +#home_account_pane #ws_legend .repoInfoBadge .repoInfoBox { position: absolute; - top: 6px; - bottom: 6px; - left: 14px; - right: 16px; + width: 100%; + height: 100%; } -#home_account_pane #ws_legend .repoInfoTitle { +#home_account_pane #ws_legend .repoInfoBadge .repoInfoBody { + padding: 12px 16px; +} +#home_account_pane #ws_legend .repoInfoBadge .repoInfoBody > div { + width: 100%; +} +#home_account_pane #ws_legend .repoInfoBadge .repoInfoHeader { + padding: 7px 16px; + border-top: 1px solid rgba(0, 0, 0, 0.1); + line-height: 25px; +} +#home_account_pane #ws_legend .repoInfoBadge .repoInfoHeader .repoInfoTitle { float: left; font-weight: 500; text-transform: none; - font-size: 16px; + font-size: 13px; text-align: left; color: rgba(255, 255, 255, 0.76); - line-height: 45px; } -#home_account_pane #ws_legend .repoInfoBadge span[class^="icon-"], -#home_account_pane #ws_legend .repoInfoBadge span[class^="mdi mdi-"] { +#home_account_pane #ws_legend .repoInfoBadge .repoInfoHeader span[class^="icon-"], +#home_account_pane #ws_legend .repoInfoBadge .repoInfoHeader span[class^="mdi mdi-"] { display: block; - font-size: 30px; - line-height: 45px; - opacity: 0.9; + font-size: 18px; + opacity: 0.76; text-align: right; + line-height: 25px; +} +#home_account_pane #ws_legend .repoInfoBadge.main { + background-color: rgba(0, 150, 136, 0.85); + width: 326px; + font-size: 13px; +} +#home_account_pane #ws_legend .repoInfoBadge.main.size-3 { + width: 492px; } -#home_account_pane #ws_legend .repoInfoBody > div { +#home_account_pane #ws_legend .repoInfoBadge.main.size-4 { + width: 655px; +} +#home_account_pane #ws_legend .repoInfoBadge.main h4 { + margin: 0; + padding: 0; + font-weight: 400; + font-size: 20px; +} +#home_account_pane #ws_legend .repoInfoBadge.main .repoInfoBody { + padding: 12px 16px; +} +#home_account_pane #ws_legend .repoInfoBadge.main .repoInfoHeader { + padding-right: 8px; +} +#home_account_pane #ws_legend .repoInfoBadge.main .repoInfoTitle { width: 100%; } +#home_account_pane #ws_legend .repoInfoBadge.main .repoInfoTitle span.enter_save_choice input { + margin: 0; +} +#home_account_pane #ws_legend .repoInfoBadge.main .repoInfoTitle a { + color: white; + font-weight: 500; + float: right; + text-decoration: none; + text-transform: uppercase; + display: inline-block; + padding: 0 8px; + border-radius: 2px; + transition: all 550ms cubic-bezier(0.23, 1, 0.32, 1) 0ms; +} +#home_account_pane #ws_legend .repoInfoBadge.main .repoInfoTitle a:hover { + background-color: rgba(255, 255, 255, 0.5); +} #home_account_pane #ws_legend > small { font-size: 16px; line-height: 1.4em; @@ -342,11 +405,6 @@ #home_account_pane #ws_legend.empty_ws_legend { opacity: 0; } -#home_account_pane #ws_legend .enter_save_choice { - opacity: 0.7; - font-size: 13px; - margin-top: 10px; -} #home_account_pane #list_cont { overflow-y: auto; } @@ -494,6 +552,7 @@ div#tutorial_dl_apps_pane div.dl_blocks_sep { div#tutorial_dl_apps_pane div#dl_pydio_cont { width: 750px; margin: 0 auto; + background-color: transparent; } div#tutorial_dl_apps_pane div#dl_pydio_for { display: none; @@ -501,12 +560,22 @@ div#tutorial_dl_apps_pane div#dl_pydio_for { margin: 44px 18px; font-size: 21px; } +div#tutorial_dl_apps_pane span.dl_tooltip_container { + display: inline-block; + float: left; + width: 90px; + text-align: center; +} +div#tutorial_dl_apps_pane span.dl_tooltip_container div.mui-tooltip { + top: 0; + width: 200px; + left: -50px; +} div#tutorial_dl_apps_pane div#dl_pydio_win, div#tutorial_dl_apps_pane div#dl_pydio_mac, div#tutorial_dl_apps_pane div#dl_pydio_ios, div#tutorial_dl_apps_pane div#dl_pydio_android { width: 90px; - float: left; padding-top: 8px; position: relative; } diff --git a/core/src/plugins/access.ajxp_home/res/home.less b/core/src/plugins/access.ajxp_home/res/home.less index bcc16da4b1..829fc41983 100644 --- a/core/src/plugins/access.ajxp_home/res/home.less +++ b/core/src/plugins/access.ajxp_home/res/home.less @@ -306,63 +306,130 @@ text-align: center; font-size: 34px; color: white; - margin: 20px; line-height: 55px; opacity: 0; transition: opacity ease 0.9s; position: relative; top: 30px; + @infoBadgeWidth:160px; + @infoBadgeMargin:3px; .repoInfoBadge { + animation: fadein 0.2s ease-in; position: relative; + box-sizing: border-box; display: inline-block; - font-size: 24px; - min-width: 210px; - max-width: 210px; - line-height: 30px; - background-color: rgba(0, 0, 0, 0.16); + font-size: 20px; + width: @infoBadgeWidth; + line-height: 25px; + background-color: rgba(0, 150, 136, 0.76); border-radius: 3px; - padding: 6px 16px 6px 14px; - margin: 26px 8px; - min-height: 106px; + padding: 0; + margin: @infoBadgeMargin; + min-height: 114px; vertical-align: top; text-align: left; clear: both; - } + color: rgb(255, 255, 255); + box-shadow: 0 3px 6px rgba(0,0,0,.16),0 3px 6px rgba(0,0,0,.23); + > div { + clear: both; + } + &:nth-child(1){ + background-color: rgba(96, 125, 139, 0.85); + } + &:nth-child(2){ + background-color: rgba(33,150,243,0.85); + } + &:nth-child(3){ + background-color: rgba(244, 67, 54, 0.75); + } + &:nth-child(4){ + background-color: rgba(0, 150, 136, 0.85); + } + .repoInfoBox { + position: absolute; + width: 100%; + height: 100%; + } + .repoInfoBody { + padding: 12px 16px; + > div { + width: 100%; + } + } + .repoInfoHeader{ + padding: 7px 16px; + border-top: 1px solid rgba(0,0,0,0.10); + line-height: 25px; + .repoInfoTitle{ + float: left; + font-weight: 500; + text-transform: none; + font-size: 13px; + text-align: left; + color: rgba(255, 255, 255, 0.76); + } + span[class^="icon-"], span[class^="mdi mdi-"] { + display: block; + font-size: 18px; + opacity: 0.76; + text-align: right; + line-height: 25px; + } + } - .repoInfoBadge > div { - clear: both; - } + &.main{ + background-color: rgba(0, 150, 136, 0.85); + width: @infoBadgeWidth * 2 + @infoBadgeMargin * 2; + &.size-3{ + width: @infoBadgeWidth * 3 + @infoBadgeMargin * 4; + } + &.size-4{ + width: @infoBadgeWidth * 4 + @infoBadgeMargin * 5; + } + font-size: 13px; + h4{ + margin: 0; + padding: 0; + font-weight: 400; + font-size: 20px; + } + .repoInfoBody{ + padding: 12px 16px; + } + .repoInfoHeader{ + padding-right: 8px; + } + .repoInfoTitle{ + width: 100%; + span.enter_save_choice{ + input{ + margin: 0; + } + } + a{ + color: white; + font-weight: 500; + float: right; + text-decoration: none; + text-transform: uppercase; + display: inline-block; + padding: 0 8px; + border-radius: 2px; + transition: @bezier_transition; + &:hover{ + background-color: rgba(255,255,255,0.5); + } + } + } - .repoInfoBox { - position: absolute; - top: 6px; - bottom: 6px; - left: 14px; - right: 16px; - } + } - .repoInfoTitle { - float: left; - font-weight: 500; - text-transform: none; - font-size: 16px; - text-align: left; - color: rgba(255, 255, 255, 0.76); - line-height: 45px; } - .repoInfoBadge span[class^="icon-"], .repoInfoBadge span[class^="mdi mdi-"] { - display: block; - font-size: 30px; - line-height: 45px; - opacity: 0.9; - text-align: right; - } - .repoInfoBody > div { - width: 100%; - } + > small { font-size: 16px; @@ -378,12 +445,6 @@ opacity: 0; } - .enter_save_choice{ - opacity: 0.7; - font-size: 13px; - margin-top: 10px; - } - } #list_cont{ @@ -545,16 +606,28 @@ div#tutorial_dl_apps_pane{ div#dl_pydio_cont{ width: 750px; margin: 0 auto; + background-color: transparent; } div#dl_pydio_for{ display: none; float: left;margin: 44px 18px;font-size: 21px; } + span.dl_tooltip_container{ + display: inline-block; + float:left; + width: 90px; + text-align: center; + div.mui-tooltip{ + top:0; + width:200px; + left: -50px; + } + } + @dl_element_width:90px; div#dl_pydio_win, div#dl_pydio_mac, div#dl_pydio_ios, div#dl_pydio_android{ width: @dl_element_width; - float:left; padding-top: 8px; position: relative; a.icon-laptop, a.icon-desktop, a.icon-tablet, a.icon-mobile-phone{ diff --git a/core/src/plugins/access.ajxp_home/res/i18n/ca.php b/core/src/plugins/access.ajxp_home/res/i18n/ca.php index 994bac0683..37c83a982c 100644 --- a/core/src/plugins/access.ajxp_home/res/i18n/ca.php +++ b/core/src/plugins/access.ajxp_home/res/i18n/ca.php @@ -83,5 +83,9 @@
  • Protegint l'aplicació mitjançant un codi PIN
  • Usant marcadors i el motor de cerca
    • ", "67"=> "No sou %s? %logout", + "68"=> "Download Sync Client for Windows", + "69"=> "Download Sync Client for Mac OSX", + "70"=> "Native application for iOS devices", + "71"=> "Native application for Android Devices", ); \ No newline at end of file diff --git a/core/src/plugins/access.ajxp_home/res/i18n/de.php b/core/src/plugins/access.ajxp_home/res/i18n/de.php index 57be8cc577..559b804ffa 100644 --- a/core/src/plugins/access.ajxp_home/res/i18n/de.php +++ b/core/src/plugins/access.ajxp_home/res/i18n/de.php @@ -80,4 +80,8 @@
  • App mit einem PIN-Code schützen
  • Verwenden von Lesezeichen und der Suchfunktion
    • ", "67"=> "Sie sind nicht %s? %logout", + "68"=> "Download Sync Client for Windows", + "69"=> "Download Sync Client for Mac OSX", + "70"=> "Native application for iOS devices", + "71"=> "Native application for Android Devices", ); diff --git a/core/src/plugins/access.ajxp_home/res/i18n/en.php b/core/src/plugins/access.ajxp_home/res/i18n/en.php index 21f4190cfb..4ba1f24b9c 100644 --- a/core/src/plugins/access.ajxp_home/res/i18n/en.php +++ b/core/src/plugins/access.ajxp_home/res/i18n/en.php @@ -80,5 +80,8 @@
  • Protecting the app with a PIN-code
  • Using bookmarks and search engine
    • ", "67"=> "If you are not %s, %logout.", - +"68"=> "Download Sync Client for Windows", +"69"=> "Download Sync Client for Mac OSX", +"70"=> "Native application for iOS devices", +"71"=> "Native application for Android Devices", ); diff --git a/core/src/plugins/access.ajxp_home/res/i18n/es.php b/core/src/plugins/access.ajxp_home/res/i18n/es.php index 8ccca9b8e1..ed97b34f06 100644 --- a/core/src/plugins/access.ajxp_home/res/i18n/es.php +++ b/core/src/plugins/access.ajxp_home/res/i18n/es.php @@ -84,5 +84,9 @@
  • Protegiendo la aplicación mediante un código PIN
  • Usando marcadores y el motor de búsqueda
    • ", "67"=> "¿No eres %s? %logout", + "68"=> "Download Sync Client for Windows", + "69"=> "Download Sync Client for Mac OSX", + "70"=> "Native application for iOS devices", + "71"=> "Native application for Android Devices", ); diff --git a/core/src/plugins/access.ajxp_home/res/i18n/fr.php b/core/src/plugins/access.ajxp_home/res/i18n/fr.php index 53f9e28bab..5cd1c76379 100644 --- a/core/src/plugins/access.ajxp_home/res/i18n/fr.php +++ b/core/src/plugins/access.ajxp_home/res/i18n/fr.php @@ -79,4 +79,8 @@
  • Protéger l'application avec un code PIN
  • Utiliser les favoris et le moteur de recherche
    • ", "67"=> "Vous n'êtes pas %s, %logout.", +"68"=> "Télécharger l'appli de synchro (Windows)", +"69"=> "Télécharger l'appli de synchro (Mac)", +"70"=> "Application pour smarthpones iOS", +"71"=> "Application pour smarthpones Android", ); diff --git a/core/src/plugins/access.ajxp_home/res/i18n/hu.php b/core/src/plugins/access.ajxp_home/res/i18n/hu.php index 17479195ee..3b645ea4e0 100644 --- a/core/src/plugins/access.ajxp_home/res/i18n/hu.php +++ b/core/src/plugins/access.ajxp_home/res/i18n/hu.php @@ -83,5 +83,9 @@
  • Protecting the app with a PIN-code
  • Using bookmarks and search engine
    • ", "67"=> "You are not %s, %logout", + "68"=> "Download Sync Client for Windows", + "69"=> "Download Sync Client for Mac OSX", + "70"=> "Native application for iOS devices", + "71"=> "Native application for Android Devices", ); diff --git a/core/src/plugins/access.ajxp_home/res/i18n/it.php b/core/src/plugins/access.ajxp_home/res/i18n/it.php index 6b5d3dab39..017afd9d1a 100644 --- a/core/src/plugins/access.ajxp_home/res/i18n/it.php +++ b/core/src/plugins/access.ajxp_home/res/i18n/it.php @@ -80,5 +80,9 @@
  • Protezione dell'app attraverso un codice PIN
  • Uso dei segnalibri e del motore di ricerca
    • ", "67"=> "Non sei %s, %logout", + "68"=> "Download Sync Client for Windows", + "69"=> "Download Sync Client for Mac OSX", + "70"=> "Native application for iOS devices", + "71"=> "Native application for Android Devices", ); diff --git a/core/src/plugins/access.ajxp_home/res/i18n/nl.php b/core/src/plugins/access.ajxp_home/res/i18n/nl.php index 3fb17e2f88..e28060d3ad 100644 --- a/core/src/plugins/access.ajxp_home/res/i18n/nl.php +++ b/core/src/plugins/access.ajxp_home/res/i18n/nl.php @@ -80,6 +80,10 @@
  • Bescherm de app met een PIN-code
  • Gebruik favorieten en zoekmachine
    • ", "67"=> "Als je niet %s bent, %logout.", + "68"=> "Download Sync Client for Windows", + "69"=> "Download Sync Client for Mac OSX", + "70"=> "Native application for iOS devices", + "71"=> "Native application for Android Devices", ); diff --git a/core/src/plugins/access.ajxp_home/res/i18n/pt.php b/core/src/plugins/access.ajxp_home/res/i18n/pt.php index 749c881119..a4ea977a2f 100644 --- a/core/src/plugins/access.ajxp_home/res/i18n/pt.php +++ b/core/src/plugins/access.ajxp_home/res/i18n/pt.php @@ -80,5 +80,9 @@
  • Protecting the app with a PIN-code
  • Using bookmarks and search engine
    • ", "67"=> "You are not %s, %logout", + "68"=> "Download Sync Client for Windows", + "69"=> "Download Sync Client for Mac OSX", + "70"=> "Native application for iOS devices", + "71"=> "Native application for Android Devices", ); diff --git a/core/src/plugins/access.ajxp_home/res/i18n/ru.php b/core/src/plugins/access.ajxp_home/res/i18n/ru.php index 4f8182a04d..75e89e6c45 100644 --- a/core/src/plugins/access.ajxp_home/res/i18n/ru.php +++ b/core/src/plugins/access.ajxp_home/res/i18n/ru.php @@ -80,5 +80,9 @@
  • Защита приложения с использованием PIN-кода
  • Использование закладок и поискового механизма
    • ", "67"=> "Если Вы не %s, %logout.", + "68"=> "Download Sync Client for Windows", + "69"=> "Download Sync Client for Mac OSX", + "70"=> "Native application for iOS devices", + "71"=> "Native application for Android Devices", ); diff --git a/core/src/plugins/access.ajxp_home/res/i18n/si.php b/core/src/plugins/access.ajxp_home/res/i18n/si.php index 84eb50a503..b74924ea13 100644 --- a/core/src/plugins/access.ajxp_home/res/i18n/si.php +++ b/core/src/plugins/access.ajxp_home/res/i18n/si.php @@ -81,5 +81,9 @@
  • Protecting the app with a PIN-code
  • Using bookmarks and search engine
    • ", "67"=> "You are not %s, %logout", + "68"=> "Download Sync Client for Windows", + "69"=> "Download Sync Client for Mac OSX", + "70"=> "Native application for iOS devices", + "71"=> "Native application for Android Devices", ); diff --git a/core/src/plugins/access.ajxp_home/res/react/WelcomeComponents.js b/core/src/plugins/access.ajxp_home/res/react/WelcomeComponents.js index 639ff9e392..5d3e2e2fb5 100644 --- a/core/src/plugins/access.ajxp_home/res/react/WelcomeComponents.js +++ b/core/src/plugins/access.ajxp_home/res/react/WelcomeComponents.js @@ -43,16 +43,19 @@ configHref:React.PropTypes.string, containerClassName:React.PropTypes.string, iconClassName:React.PropTypes.string, - messageId:React.PropTypes.string + messageId:React.PropTypes.string, + tooltipId:React.PropTypes.string }, render: function(){ return ( -
    - - -
    {MessageHash[this.props.messageId]}
    -
    + +
    + + +
    {MessageHash[this.props.messageId]}
    +
    + ); } }); @@ -257,6 +260,7 @@ containerClassName="icon-tablet" iconClassName="icon-apple" messageId="user_home.59" + tooltipId="user_home.70" /> ); @@ -271,6 +275,7 @@ containerClassName="icon-mobile-phone" iconClassName="icon-android" messageId="user_home.58" + tooltipId="user_home.71" /> ); } @@ -284,6 +289,7 @@ containerClassName="icon-laptop" iconClassName="icon-windows" messageId="user_home.61" + tooltipId="user_home.68" /> ); } @@ -297,6 +303,7 @@ containerClassName="icon-desktop" iconClassName="icon-apple" messageId="user_home.60" + tooltipId="user_home.69" /> ); } @@ -307,9 +314,8 @@ return (
    -
    -
    {MessageHash['user_home.57']}
    - {syncBlocks} {blocksSep} {mobileBlocks} +
    + {syncBlocks}{blocksSep}{mobileBlocks}
    ); @@ -419,18 +425,32 @@ ); } + if(blocks.length == 1){ + blocks.push(
    ); + } + return (
    - {this.state.workspace.getLabel()} - {this.state.workspace.getDescription()} +
    +
    +
    +

    {this.state.workspace.getLabel()}

    + {this.state.workspace.getDescription()} +
    +
    + + + + + + {MessageHash['user_home.42']} + +
    +
    +
    {blocks}
    -
    - - - {MessageHash['user_home.42']} -
    ) } @@ -438,19 +458,21 @@ var HomeWorkspaceLegendInfoBlock = React.createClass({ render:function(){ - return
    -
    -
    - - {this.props.badgeTitle} - - -
    -
    - {this.props.children} + return ( +
    +
    +
    + {this.props.children} +
    +
    + + {this.props.badgeTitle} + + +
    -
    + ); } }); diff --git a/core/src/plugins/core.ajaxplorer/i18n/fr.php b/core/src/plugins/core.ajaxplorer/i18n/fr.php index e748be123d..4fa7f3d722 100644 --- a/core/src/plugins/core.ajaxplorer/i18n/fr.php +++ b/core/src/plugins/core.ajaxplorer/i18n/fr.php @@ -586,8 +586,8 @@ "527"=> "Partagé", "528"=> "Utilisateurs internes", "530"=> "Utilisateurs externes", -"531"=> "Users", -"532"=> "Groups", +"531"=> "Utilisateurs", +"532"=> "Groupes", "533" => "Identifiant utilisé pour se logger, veuillez utiliser des caractères alphanumériques ou d'email, en minuscule.", "534" => "Mot de passe utilisé pour se logger", "535" => "Envoyer le mot de passe par email",