Skip to content
This repository has been archived by the owner on Nov 25, 2020. It is now read-only.

Commit

Permalink
Rework global toolbar menus
Browse files Browse the repository at this point in the history
  • Loading branch information
cdujeu committed Jan 12, 2014
1 parent f8280b7 commit c1eca03
Show file tree
Hide file tree
Showing 38 changed files with 67 additions and 26 deletions.
2 changes: 1 addition & 1 deletion core/src/plugins/access.ajxp_user/i18n/en.php
Expand Up @@ -19,7 +19,7 @@
* The latest code can be found at <http://pyd.io/>.
*/
$mess=array(
"title"=> "My Dashboard",
"title"=> "Dashboard",
"desc" => "Manage my account preferences, my address book, shared elements, etc.",
"1" => "Address Book",
"2" => "Shared folders",
Expand Down
12 changes: 6 additions & 6 deletions core/src/plugins/access.ajxp_user/i18n/fr.php
Expand Up @@ -52,12 +52,12 @@
"31"=> "Description",
"32"=> "RàZ",
"33"=> "Remise à zéro du compteur",
"title" => "My Dashboard",
"desc" => "Manage my account preferences, my address book, shared elements, etc.",
"34" => "My Shares",
"35" => "All my shared items (files and folders)",
"36" => "Parameters",
"37" => "My profile and application settings",
"title" => "Tableau de bord",
"desc" => "Gérer mes préférences, carnet d'adresses, éléments partagés, etc.",
"34" => "Mes partages",
"35" => "Tous les éléments partagés (fichiers et répertoires)",
"36" => "Paramètres",
"37" => "Profil et réglages",
"38"=> "Notifications",
"39"=> "Selectionner un workspace",
"40"=> "Bienvenue, %s",
Expand Down
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/ca.php
Expand Up @@ -566,5 +566,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/cs.php
Expand Up @@ -564,5 +564,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/da.php
Expand Up @@ -569,5 +569,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/de.php
Expand Up @@ -568,5 +568,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
3 changes: 2 additions & 1 deletion core/src/plugins/core.ajaxplorer/i18n/en.php
Expand Up @@ -565,5 +565,6 @@
"507"=> "Welcome on %s",
"508"=> "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509"=> "Save the current users list as a personal team",
"510"=> "Please enter a team label"
"510"=> "Please enter a team label",
"511"=> "My %s",
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/es.php
Expand Up @@ -570,5 +570,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/et.php
Expand Up @@ -567,5 +567,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/eus.php
Expand Up @@ -565,6 +565,7 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/fi.php
Expand Up @@ -567,5 +567,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/fr.php
Expand Up @@ -566,5 +566,6 @@
"508"=> "Je vous ai créé un compte sur %s. Pour vous connecter, veuillez cliquer sur le lien suivant %link, et utiliser ces identifiants: <br><br> Login: %user <br><br> Mot de passe: %pass",
"509" => "Sauver la sélection comme une équipe",
"510" => "Veuillez entrer un libellé",
"511" => "Mon %s",
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/gr.php
Expand Up @@ -564,5 +564,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/he.php
Expand Up @@ -564,5 +564,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/hu.php
Expand Up @@ -569,5 +569,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/it.php
Expand Up @@ -584,5 +584,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/ja.php
Expand Up @@ -569,6 +569,7 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* 文章はここまで */
/* 文章終了 */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/kr.php
Expand Up @@ -573,5 +573,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/nl.php
Expand Up @@ -570,5 +570,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/no.php
Expand Up @@ -568,5 +568,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/pl.php
Expand Up @@ -564,5 +564,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/pt-br.php
Expand Up @@ -568,5 +568,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/pt.php
Expand Up @@ -564,6 +564,7 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
/* password strength tester */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/ru.php
Expand Up @@ -564,5 +564,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/si.php
Expand Up @@ -565,6 +565,7 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
/* password strength tester */
/* quick access keys */
Expand Down
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/sv.php
Expand Up @@ -564,5 +564,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/tr.php
Expand Up @@ -567,5 +567,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/zh-tw.php
Expand Up @@ -567,5 +567,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
1 change: 1 addition & 0 deletions core/src/plugins/core.ajaxplorer/i18n/zh.php
Expand Up @@ -557,5 +557,6 @@
"508" => "I just created an account for you on %s. To connect, please click on the following link %link and use these credentials: <br><br> Login: %user <br><br> Password: %pass",
"509" => "Save the current users list as a personal team",
"510" => "Please enter a team label",
"511" => "My %s",
/* END SENTENCE */
);
2 changes: 1 addition & 1 deletion core/src/plugins/core.conf/standard_conf_actions.xml
Expand Up @@ -492,7 +492,7 @@
</processing>
</action>
<action name="switch_to_settings">
<gui src="drive_remote.png" text="165" title="165" accessKey="settings_access_key" hasAccessKey="true" iconClass="icon-cogs" >
<gui src="drive_remote.png" text="165" title="506" accessKey="settings_access_key" hasAccessKey="true" iconClass="icon-cogs" >
<context dir="false" recycle="true" selection="false" actionBar="true" actionBarGroup="utils" ajxpWidgets="UserWidget::logging_string"/>
</gui>
<rightsContext adminOnly="true" noUser="true" read="false" userLogged="only" write="false"/>
Expand Down
Expand Up @@ -262,7 +262,7 @@ Class.create("NotificationLoader", {
}.bind(this);
protoMenu.options = Object.extend(protoMenu.options, {
position: "bottom middle",
menuMaxHeight: 350,
menuMaxHeight: 480,
topOffset: 14,
menuTitle: this.hasAlerts ? MessageHash['notification_center.3'] : MessageHash['notification_center.5'],
beforeShow: function(){
Expand Down
Expand Up @@ -66,10 +66,12 @@ width: 150px;
padding: 2px 0;
white-space: nowrap;
text-overflow: ellipsis;
color: rgba(255, 255, 255, 0.57);
}
.notif_event_label {
.notif_event_container > div.notif_event_label {
font-size: 14px;
letter-spacing: 1px;
color: white;
}

#feed_content .ui360container.nobackground {
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/manifest.xml
Expand Up @@ -116,7 +116,7 @@
<div id="global_toolbar" ajxpClass="LogoWidget">
<div id="logging_string" ajxpClass="UserWidget" ajxpOptions='{"menuEvent" : "over"}'></div>
<div id="top_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["user"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
<div id="repo_chooser" ajxpClass="RepositorySelect" ajxpOptions='{"menuPosition": "bottom middle", "menuOffsetTop":11, "menuOffsetLeft":0, "menuMaxHeight":350, "menuEvent":"over", "simpleLabel":"<span class=\"icon-sitemap\"></span><span class=\"ws-label\" ajxp_message_id=\"455\">AJXP_MESSAGE[455]</span><span class=\"icon-caret-down\"></span>"}'></div>
<div id="repo_chooser" ajxpClass="RepositorySelect" ajxpOptions='{"menuPosition": "bottom middle", "menuOffsetTop":11, "menuOffsetLeft":0, "menuMaxHeight":535, "menuEvent":"over", "simpleLabel":"<span class=\"icon-sitemap\"></span><span class=\"ws-label\" ajxp_message_id=\"455\">AJXP_MESSAGE[455]</span><span class=\"icon-caret-down\"></span>"}'></div>
</div>
<div id="workspace_toolbar" ajxpClass="AjxpPane">
<div id="simple_repository_label" ajxpClass="RepositorySimpleLabel" ajxpOptions='{"bindSizeTo":{"width":{"id":"topPane", "events":["resize-AjxpTabulator-cpane_tabs","actions_refreshed"], "min":150,"offset":-5}}}'></div>
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/res/js/ajaxplorer.js

Large diffs are not rendered by default.

Expand Up @@ -144,14 +144,16 @@ Class.create("UserWidget", {
this.menu.refreshList();
}else{
this.menu = new Proto.Menu({
className: 'menu rootDirChooser rightAlignMenu',
className: 'menu rootDirChooser menuDetails',
mouseClick:(this.options.menuEvent?this.options.menuEvent:"left"),
position: 'bottom right',
anchor:this.element,
createAnchor:false,
topOffset:2,
leftOffset:-3,
menuItems: menuItems,
menuTitle: MessageHash[511].replace('%s', ajaxplorer.getPluginConfigs("ajaxplorer").get("APPLICATION_TITLE")),
detailedItems: true,
fade:true,
zIndex:1500,
beforeShow : function(e){
Expand Down
10 changes: 8 additions & 2 deletions core/src/plugins/gui.ajax/res/js/lib/prototype/proto.menu.js
Expand Up @@ -23,6 +23,7 @@ Proto.Menu = Class.create({
submenuArrow:ajxpResourcesFolder+'/images/arrow_right.png',
position:'bottom',
menuTitle:'',
detailedItems: false,
fade: false,
zIndex: 100,
createAnchor:false,
Expand Down Expand Up @@ -218,8 +219,13 @@ Proto.Menu = Class.create({
newItem.setStyle({position:"relative"});
}
if(item.action_id && ajaxplorer && ajaxplorer.getActionBar() && ajaxplorer.getActionBar().getActionByName(item.action_id)){
item.name = ajaxplorer.getActionBar().getActionByName(item.action_id).getKeyedText();
item.title = ajaxplorer.getActionBar().getActionByName(item.action_id).options.title;
var actionObject = ajaxplorer.getActionBar().getActionByName(item.action_id);
if(this.options.detailedItems){
item.name = '<span class="menu_label">'+ actionObject.getKeyedText() + '</span>' + '<span class="menu_description">'+ actionObject.options.title + '</span>'
}else{
item.name = actionObject.getKeyedText();
}
item.title = actionObject.options.title;
}
var img = '';
if(item.icon_class && window.ajaxplorer.currentThemeUsesIconFonts){
Expand Down
22 changes: 13 additions & 9 deletions core/src/plugins/gui.ajax/res/themes/vision/css/ajaxplorer.css
Expand Up @@ -3820,6 +3820,7 @@ div.menu {
font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-moz-border-radius:5px;
border-radius: 2px;
opacity: 0.97;
}
div.menu a {
display: block;
Expand Down Expand Up @@ -3916,13 +3917,14 @@ div.menu a {
}

.rootDirChooser li.menuTitle {
padding: 7px 0 7px 8px;
color: rgb(255, 255, 255);
color: rgba(77, 197, 195, 1);
padding: 10px 8px 4px;
text-align: left;
background-color: rgba(255, 255, 255, 0.16);
font-size: 13px;
/* background-color: rgba(77, 197, 195, 1); */
font-size: 22px;
/*margin: 1px;*/
border-bottom: 1px solid rgb(172, 172, 172);
/* border-bottom: 1px solid #fff; */
letter-spacing: 1px;
}

.menu li.menuTitle{
Expand Down Expand Up @@ -4083,7 +4085,8 @@ div.menu a {
.bookmarksMenu a.hovered,
.rootDirChooser a.hovered
{
background-color: #73a2d7;
background-color: rgba(200, 219, 223, 0.21);
box-shadow: inset 1px 1px 0 rgba(255, 255, 255, 0.12);
color: #fff;
}

Expand Down Expand Up @@ -4121,7 +4124,7 @@ div.menu a {

.menu.menuDetails span.ajxp_icon_span{
float: left;
padding: 3px 9px 15px 4px;
padding: 3px 9px 23px 4px;
font-size: 18px;
}

Expand All @@ -4133,15 +4136,16 @@ div.menu a {
.menu.menuDetails span.menu_description{
display: block;
letter-spacing: 0;
line-height: 13px;
line-height: 15px;
font-size: 11px;
color: rgba(255, 255, 255, 0.57);
padding-top: 2px;
}

.menu.menuDetails img{
display: none;
}


.rightAlignMenu{
width: 180px !important;
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/res/themes/vision/css/allz.css

Large diffs are not rendered by default.

0 comments on commit c1eca03

Please sign in to comment.