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

Commit

Permalink
Actions, fonts, CSS ...
Browse files Browse the repository at this point in the history
  • Loading branch information
@cdujeu
cdujeu committed Mar 7, 2016
1 parent bc0a192 commit 13f5216
Show file tree
Hide file tree
Showing 18 changed files with 305 additions and 79 deletions.
6 changes: 3 additions & 3 deletions core/src/plugins/access.fs/fsActions.xml
View file
Expand Up @@ -47,7 +47,7 @@
</processing>
</action>
<action name="mkdir">
<gui text="154" title="155" src="folder_new.png" iconClass="icon-plus" accessKey="folder_access_key" hasAccessKey="true">
<gui text="154" title="155" src="folder_new.png" iconClass="mdi mdi-folder-plus" accessKey="folder_access_key" hasAccessKey="true">
<context selection="false" dir="true" recycle="hidden" actionBar="true"
contextMenu="true" infoPanel="false" actionBarGroup="put,minisite" inZip="false"/>
</gui>
Expand Down Expand Up @@ -119,7 +119,7 @@
</processing>
</action>
<action name="upload">
<gui text="27" title="27" src="yast_backup.png" iconClass="icon-upload-alt" accessKey="upload_access_key" hasAccessKey="true">
<gui text="27" title="27" src="yast_backup.png" iconClass="mdi mdi-upload" accessKey="upload_access_key" hasAccessKey="true">
<context selection="false" dir="true" recycle="hidden"
actionBar="true" contextMenu="true" infoPanel="false"
actionBarGroup="put,minisite,orbit_create" inZip="false">
Expand Down Expand Up @@ -203,7 +203,7 @@
</processing>
</action>
<action name="download" fileDefault="false">
<gui text="88" title="88" src="download_manager.png" iconClass="icon-download-alt" accessKey="download_access_key" hasAccessKey="true">
<gui text="88" title="88" src="download_manager.png" iconClass="mdi mdi-download" accessKey="download_access_key" hasAccessKey="true">
<context selection="true" dir="" recycle="false"
actionBar="true" contextMenu="true" infoPanel="true"
actionBarGroup="get,inline,info_panel">
Expand Down
4 changes: 2 additions & 2 deletions core/src/plugins/access.fs/fsTemplatePart.xml
View file
Expand Up @@ -27,11 +27,11 @@
</div>
<div id="cpane_container" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"browser", "flexTo":"browser"}'>
<div id="cpane_tabs" ajxpClass="AjxpTabulator" ajxpOptions='{"fit":"height", "fitParent":"browser", "refireResize":0.5, "registerAsEditorOpener":true, "saveState":false,"events":{"ajaxplorer:context_changed":"this.switchToFirstIfPathDiffers(arguments[0]);"}, "defaultTabId": "files","tabInfos" : [{"id":"files","label":"","iconClass":"icon-folder-open", "element":"files_list_pane"}]}'>
<div id="files_list_pane" ajxpClass="AjxpPane">
<div id="files_list_pane" ajxpClass="AjxpPane" ajxpOptions='{"classNamesOn":{"infoPanelFolded":{"event":"vertical_splitter-fold-status","memoKey":"folded"}}}'>
<div id="files_list_header" ajxpClass="AjxpPane">
<div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["content_pane-actions","vertical_splitter-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":5}'></div>
<div style="float:left;position:fixed;" ajxpClass="AjxpPane" id="buttons_bar_cont" ajxpOptions='{"flexTo":"files_list_header", "flexToMargin":30, "resize_events":["switchDisplayMode-FilesList-content_pane"]}'>
<div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["navigation", "change_main"],"groupOtherToolbars":["more", "change", "remote"], "groupOtherLabel":"More","skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
<div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["navigation", "info_panel","info_panel_share", "change_main"],"groupOtherToolbars":["more", "change", "remote"], "groupOtherLabel":"More","skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
</div>
</div>
<div id="vertical_splitter" ajxpClass="Splitter" class="forceComputeFit" ajxpOptions='{"direction": "vertical", "initB":250, "minB":250,"fit":"height","fitParent":"browser", "minSize":250, "invisibleBar": true, "foldingButton":"B", "foldingButtonText":341, "foldingMinSize":0}'>
Expand Down
4 changes: 2 additions & 2 deletions core/src/plugins/gui.ajax/class.AJXP_ClientDriver.php
View file
Expand Up @@ -326,7 +326,7 @@ public function nodeBookmarkMetadata(&$ajxpNode)
$ajxpNode->mergeMetadata(array(
"ajxp_bookmarked" => "true",
"overlay_icon" => "bookmark.png",
"overlay_class" => "icon-bookmark"
"overlay_class" => "icon-bookmark-empty"
), true);
return;
}
Expand All @@ -338,7 +338,7 @@ public function nodeBookmarkMetadata(&$ajxpNode)
$ajxpNode->mergeMetadata(array(
"ajxp_bookmarked" => "true",
"overlay_icon" => "bookmark.png",
"overlay_class" => "icon-bookmark"
"overlay_class" => "icon-bookmark-empty"
), true);
$ajxpNode->setMetadata("ajxp_bookmarked", array("ajxp_bookmarked"=> "true"), true, AJXP_METADATA_SCOPE_REPOSITORY, true);
}
Expand Down
31 changes: 31 additions & 0 deletions core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpPane.js
View file
Expand Up @@ -104,6 +104,19 @@ Class.create("AjxpPane", {
this.scrollbar = new Control.ScrollBar(this.htmlElement,this.scroller, {fixed_scroll_distance:50});
}

if(this.options.classNamesOn){
this._classNamesOnListeners = {};
for(var className in this.options.classNamesOn){
if(!this.options.classNamesOn.hasOwnProperty(className)) continue;
var data = this.options.classNamesOn[className];
var eventName = data["event"];
var memoKey = data["memoKey"];
var listener = this.classNameOnListener.bind(this, className, memoKey);
document.observe("ajaxplorer:" + eventName, listener);
this._classNamesOnListeners[eventName] = listener;
}
}

var cPref = this.getUserPreference('rootElementClassPreference');
if(cPref){
if(Object.isString(cPref))cPref= {className:cPref};
Expand All @@ -123,6 +136,18 @@ Class.create("AjxpPane", {

},

classNameOnListener:function(className, memoKey, event){
var add = false;
try{
add = event.memo[memoKey];
}catch(e){}
if(add) {
this.htmlElement.addClassName(className);
} else {
this.htmlElement.removeClassName(className);
}
},

parseComponentConfig: function(domNode){
var contentNodes = XMLUtils.XPathSelectNodes(domNode, "additional_content");
// Check additional classes
Expand Down Expand Up @@ -312,6 +337,12 @@ Class.create("AjxpPane", {
if(this.configObserver){
document.stopObserving("ajaxplorer:component_config_changed", this.configObserver);
}
if(this._classNamesOnListeners){
for (var k in this._classNamesOnListeners){
if(!this._classNamesOnListeners.hasOwnProperty(k)) continue;
document.stopObserving("ajaxplorer:" + k, this._classNamesOnListeners[k]);
}
}
},

/**
Expand Down
1 change: 1 addition & 0 deletions core/src/plugins/gui.ajax/res/js/vendor/prototype/splitter.js
View file
Expand Up @@ -381,6 +381,7 @@ Class.create("Splitter", AjxpPane, {
if(!pane) pane = this.foldedPane;
if(!this.paneA) return;
var state = this.splitbar.hasClassName("folded");
document.fire("ajaxplorer:"+this.htmlElement.id+"-fold-status", {"folded":state});
if(!this.getFoldingAction()) return;
if(this.options.foldingAlternateClose){
this.getFoldingAction()[(state?"enable":"disable")]();
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion core/src/plugins/gui.ajax/res/themes/orbit/css/components/actionbar.less
View file
Expand Up @@ -32,7 +32,6 @@
display: inline-block;
float: left;
font-size: 11px;
letter-spacing: 1px;
margin: 5px 2px 0 1px;
outline: none;
overflow: visible;
Expand Down
26 changes: 15 additions & 11 deletions core/src/plugins/gui.ajax/res/themes/orbit/css/components/infopanel.less
View file
Expand Up @@ -54,22 +54,21 @@
img {
margin-top: 0 !important;
margin-bottom: 0 !important;
background-color: white;
box-shadow: 2px 2px 3px rgba(0,0,0,0.25);
&.thumbnail_iconlike_shadow{
box-shadow: @reactBoxShadowDepth1;
}
}
div.infoPanelBasenameTitle{
color: @colorCodeFolder;
font-weight: 500;
font-size: 13px;
font-size: 16px;
margin-bottom: 20px;
line-height: 1.5em;
text-align: left;
word-break:break-all;
}
}



.infoPanelTable,
div.infoPanelRow
{
Expand All @@ -94,6 +93,11 @@
color: @infopanel_values_color;
line-height: 1.3em;
vertical-align: top;
&[data-metatype="css_label"]{
padding: 5px;
border-radius: 2px;
margin-bottom: 10px;
}
}

div.folded_icons{
Expand Down Expand Up @@ -230,7 +234,8 @@
}

div.info_panel_primary_multiple{
margin: 6px 2px 6px 3px !important;
margin-top: 0 !important;
border-top: 0;
}

.info_panel_multiple_tile {
Expand All @@ -240,10 +245,10 @@
padding: 7px 2%;
background-color: white;
margin: 0 1% 6px;
border-radius: 4px;
position: relative;
text-align: center;
box-shadow: 0 0 2px rgba(211, 211, 211, 0.6);
border-radius: 0;
box-shadow: @reactBoxShadowDepthMini;
}

.info_panel_multiple_tile div.tile_preview img {
Expand Down Expand Up @@ -344,14 +349,13 @@
}

div.infoPanelAllMetadata span.meta_user_tag_block {
font-size: 0.7em;
display: inline-block;
background-color: rgba(52, 94, 121, 0.78);
color: white;
padding: 0 7px;
padding: 2px 5px;
border-radius: 4px;
margin-right: 5px;
font-weight: bold;
font-weight: 500;
}

.ipanel_no_selection_select{
Expand Down
25 changes: 16 additions & 9 deletions core/src/plugins/gui.ajax/res/themes/orbit/css/components/messagebox.less
View file
Expand Up @@ -2,50 +2,57 @@
/* MESSAGE BOX */
/********************/
@messagebox_box_shadow: 1px 1px 1px rgba(0,0,0,0.5);
@messagebox_background_color:#323232;
@messagebox_color:@white;
@messagebox_error_tint:#960000;
@messagebox_success_tint:#009600;
@messagebox_font_size:16px;
@messagebox_font_size:14px;

.messageBox
{
position: absolute;
z-index: 1500;
cursor: pointer;
border-radius: 4px;
border-radius: 2px;
background-color: @messagebox_background_color;
color:@messagebox_color;
box-shadow: @messagebox_box_shadow;
&.errorMessage
{
color: @messagebox_error_tint;
background-color: desaturate(lighten(@messagebox_error_tint, 50%), 50%);
/*background-color: desaturate(lighten(@messagebox_error_tint, 50%), 50%);*/
& > div#message_content::before {
color: @messagebox_error_tint;
content: '\f071';
}
}

&.logMessage
{
color: @messagebox_success_tint;
background-color: desaturate(lighten(@messagebox_success_tint, 50%), 50%);
/*background-color: desaturate(lighten(@messagebox_success_tint, 50%), 50%);*/
& > div#message_content::before {
color: @messagebox_success_tint;
content: '\f058';
}
}

#message_content
{
font-size: 14px;
margin: 10px 7px;
font-family: @fontReact;
-webkit-font-smoothing: antialiased;
font-size: @messagebox_font_size;
margin: 24px 18px;
overflow-y: auto;
max-height: 120px;
letter-spacing: 0;
line-height: @messagebox_font_size + 4px;
&::before {
font-weight: normal;
font-style: normal;
font-family: @fontAwesome;
display: block;
padding: 0 6px;
margin-right: 5px;
font-size: @messagebox_font_size;
font-size: @messagebox_font_size + 4px;
margin-top: 2px;
float: left;
}
Expand Down
11 changes: 9 additions & 2 deletions core/src/plugins/gui.ajax/res/themes/orbit/css/components/selectablelist.less
View file
Expand Up @@ -85,7 +85,7 @@
right: 10px !important;
font-size: 11px;
span.overlay-class-span{
margin-left: 7px;
margin-left: 10px;
}
}
.selected span.overlay-class-span{
Expand Down Expand Up @@ -118,7 +118,7 @@
overflow: hidden;
}
> div > div.overlay_icon_div{
top: 24px !important;
top: 27px !important;
right: 21px !important;
font-size: 16px;
transition: top 0.6s ease;
Expand Down Expand Up @@ -242,12 +242,19 @@
font-size: 0.7em;
}

&.fl-displayMode-thumbsize-large div.thumbLabel{
font-size: 0.9em;
}

&.fl-displayMode-thumbsize-small div.thumbLabel{
display: none;
}

&.selected-focus {
background-color: @filelist_thumbnail_background !important;
&.fl-displayMode-thumbsize-small{
background-color: @filelist_selection_background !important;
}
div.thumbLabel{
opacity: 1;
background-color: @filelist_selection_background;
Expand Down
12 changes: 12 additions & 0 deletions core/src/plugins/gui.ajax/res/themes/orbit/css/fonts/mdi-subset.css
View file
Expand Up @@ -8,10 +8,22 @@
transform: translate(0, 0);
}

.mdi-download:before {
content: "\f2cf";
}

.mdi-folder-plus:before {
content: "\f34c";
}

.mdi-share:before {
content: "\f585";
}

.mdi-share-variant:before {
content: "\f586";
}

.mdi-upload:before {
content: "\f63f";
}
10 changes: 0 additions & 10 deletions core/src/plugins/gui.ajax/res/themes/orbit/css/media.css
View file
Expand Up @@ -50,7 +50,6 @@ and (max-width : 720px) {
div.toolbarGroup span.ajxp_icon_span
{
display: inline-block !important;
padding: 5px 1px 4px;
}

div.toolbarGroup a{
Expand Down Expand Up @@ -146,15 +145,6 @@ and (max-width : 420px){
padding-top:0;
}

#buttons_bar, #buttons_bar_top{

}

#buttons_bar a, #buttons_bar_top a{
padding: 1px 8px;
border-radius: 19px;
}

.tabulatorContainer.panelHeader.icons_only {
width: 37px;
}
Expand Down

0 comments on commit 13f5216

Please sign in to comment.