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

Commit

Permalink
Replace icon-remove by mdi.mdi-close wherever possible
Browse files Browse the repository at this point in the history
  • Loading branch information
@cdujeu
cdujeu committed Mar 28, 2016
1 parent 2b74be0 commit cedbfe9
Show file tree
Hide file tree
Showing 21 changed files with 43 additions and 39 deletions.
2 changes: 1 addition & 1 deletion core/src/plugins/action.share/res/react/ShareDialog.js
View file
Expand Up @@ -1149,7 +1149,7 @@
this.props.shareModel.setExpirationFor(linkId, "days", "");
this.refs['expirationDate'].getDOMNode().querySelector(".mui-text-field-input").value = "";
}.bind(this);
calIcon = <span className="ajxp_icon_span icon-remove-sign" onClick={clearValue}/>;
calIcon = <span className="ajxp_icon_span mdi mdi-close-circle" onClick={clearValue}/>;
var calLabel = <span className="calLabelHasValue">{this.context.getMessage(dateExpired?'21b':'21')}</span>
}
if(dlLimitValue){
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/authfront.keystore/apikeypane.css
View file
Expand Up @@ -18,7 +18,7 @@
margin: 0 auto;
}

#apikeys_pane #token_results span.icon-remove-sign{
#apikeys_pane #token_results span.mdi-close{
position: absolute;
right: -4px;
font-size: 21px;
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/authfront.keystore/manifest.xml
View file
Expand Up @@ -29,7 +29,7 @@
<div id="apikeys_pane" ajxpClass="ApikeysPane" ajxpOptions='{}' class="tabbed_editor" style="position:relative;">
<div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["keystore_bar"]}'></div>
<h3 class="dashboard_panel_title">AJXP_MESSAGE[keystore.1]</h3>
<div id="token_results"><span class="icon-remove-sign"></span><div id="token_results_content"></div></div>
<div id="token_results"><span class="mdi mdi-close"></span><div id="token_results_content"></div></div>
<div style="padding:10px;overflow: auto;" class="fit_me_to_bottom">
<h2>AJXP_MESSAGE[keystore.9]</h2>
<ul></ul>
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/core.mailer/js/react/PydioMailer.js
View file
Expand Up @@ -51,7 +51,7 @@
var clik = function(){};
if(this.state && this.state.remove){
clik = this.remove;
icon = <span className="avatar icon-remove"/>;
icon = <span className="avatar mdi mdi-close"/>;
className += ' remove';
}else{
icon = <span className={"avatar icon-" + (this.props.user.getTemporary()?"envelope":"user")}/>;
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/core.notifications/class.NotificationLoader.js
View file
Expand Up @@ -112,7 +112,7 @@ Class.create("NotificationLoader", {
var alertID = parseInt(el.getMetadata().get("alert_id"));
moreActions.push({
name:MessageHash["notification_center.7"],
icon_class:"icon-remove-sign",
icon_class:"mdi mdi-close-circle",
callback:function(e){
Event.stop(e);
Effect.Fade(e.target.up('li'));
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/core.notifications/manifest.xml
View file
Expand Up @@ -70,7 +70,7 @@
</processing>
</action>
<action name="dismiss_user_alert">
<gui text="notification_center.7" title="notification_center.7" iconClass="icon-remove-sign" src="notification_center/ICON_SIZE/feed.png" accessKey="" hasAccessKey="false">
<gui text="notification_center.7" title="notification_center.7" iconClass="mdi mdi-close-circle" src="notification_center/ICON_SIZE/feed.png" accessKey="" hasAccessKey="false">
<context selection="true" dir="" recycle="true" actionBar="true" actionBarGroup="inline-notifications" contextMenu="false" infoPanel="false"/>
<selectionContext dir="true" file="true" recycle="false" unique="true"/>
</gui>
Expand Down
4 changes: 2 additions & 2 deletions core/src/plugins/gui.ajax/res/js/ui/prototype/class.AbstractEditor.js
View file
Expand Up @@ -67,13 +67,13 @@ Class.create("AbstractEditor" , {
this.defaultActions = new Hash({
'fs' : '<a id="fsButton" class="icon-resize-full"><span message_id="235"></span></a>',
'nofs' : '<a id="nofsButton" class="icon-resize-small" style="display:none;"><span message_id="236"></span></a>',
'close':'<a id="closeButton" class="icon-remove-sign"><span message_id="86"></span></a>'
'close':'<a id="closeButton" class="mdi mdi-close-circle"><span message_id="86"></span></a>'
});
}else{
this.defaultActions = new Hash({
'fs' : '<a id="fsButton" class="icon-resize-full"><img src="'+ajxpResourcesFolder+'/images/actions/22/window_fullscreen.png" width="22" height="22" alt="" border="0"><br><span message_id="235"></span></a>',
'nofs' : '<a id="nofsButton" class="icon-resize-small" style="display:none;"><img src="'+ajxpResourcesFolder+'/images/actions/22/window_nofullscreen.png" width="22" height="22" alt="" border="0"><br><span message_id="236"></span></a>',
'close':'<a id="closeButton" class="icon-remove-sign"><img src="'+ajxpResourcesFolder+'/images/actions/22/fileclose.png" width="22" height="22" alt="" border="0"><br><span message_id="86"></span></a>'
'close':'<a id="closeButton" class="mdi mdi-close-circle"><img src="'+ajxpResourcesFolder+'/images/actions/22/fileclose.png" width="22" height="22" alt="" border="0"><br><span message_id="86"></span></a>'
});
}
if(!this.editorOptions.closable){
Expand Down
4 changes: 2 additions & 2 deletions core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpTabulator.js
View file
Expand Up @@ -113,7 +113,7 @@ Class.create("AjxpTabulator", AjxpPane, {
new klass(td, tabInfo.ajxpOptions);
tabInfo.headerElement = td;
if(tabInfo.closeable){
td.insert(new Element('span', {className:'icon-remove tab_close_button'}));
td.insert(new Element('span', {className:'mdi mdi-close tab_close_button'}));
td.down('.tab_close_button').observe('click', function(){
this.closeTab(tabInfo.id);
}.bind(this));
Expand Down Expand Up @@ -149,7 +149,7 @@ Class.create("AjxpTabulator", AjxpPane, {
this.switchTabulator(tabInfo.id);
}.bind(this) );
if(tabInfo.closeable){
td.insert(new Element('span', {className:'icon-remove tab_close_button'}));
td.insert(new Element('span', {className:'mdi mdi-close tab_close_button'}));
td.down('.tab_close_button').observe('click', function(){
this.closeTab(tabInfo.id);
}.bind(this));
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/gui.ajax/res/js/ui/prototype/class.Modal.js
View file
Expand Up @@ -66,7 +66,7 @@ Class.create("Modal", {
if(sIconClass){
hString = "<span class=\"titleString\"><span class='"+sIconClass+" ajxp_icon_span'></span>";
}
closeBtn = '<span id="modalCloseBtn" class="icon-remove" style="cursor:pointer;float:right;"></span>';
closeBtn = '<span id="modalCloseBtn" class="mdi mdi-close" style="cursor:pointer;float:right;"></span>';
}else{
closeBtn = '<img id="modalCloseBtn" style="cursor:pointer;float:right;margin-top:2px;" src="'+ajxpResourcesFolder+'/images/actions/16/window_close.png" />';
}
Expand Down
4 changes: 2 additions & 2 deletions core/src/plugins/gui.ajax/res/js/ui/prototype/class.SearchEngine.js
View file
Expand Up @@ -321,7 +321,7 @@ Class.create("SearchEngine", AjxpPane, {

if(!this.htmlElement) return;

this.htmlElement.insert('<div id="search_panel"><div id="search_form"><input style="float:left;" type="text" id="search_txt" placeholder="'+ MessageHash[87] +'" name="search_txt" onfocus="blockEvents=true;" onblur="blockEvents=false;"><a href="" id="search_button" class="icon-search" ajxp_message_title_id="184" title="'+MessageHash[184]+'"><img width="16" height="16" align="absmiddle" src="'+ajxpResourcesFolder+'/images/actions/16/search.png" border="0"/></a><span class="search_advanced_direct_access">'+MessageHash[486].toLocaleLowerCase()+' <span class="icon-caret-down"></span></span><a class="icon-remove" href="" id="stop_search_button" ajxp_message_title_id="185" title="'+MessageHash[185]+'"><img width="16" height="16" align="absmiddle" src="'+ajxpResourcesFolder+'/images/actions/16/fileclose.png" border="0" /></a></div><div id="search_results"></div></div>');
this.htmlElement.insert('<div id="search_panel"><div id="search_form"><input style="float:left;" type="text" id="search_txt" placeholder="'+ MessageHash[87] +'" name="search_txt" onfocus="blockEvents=true;" onblur="blockEvents=false;"><a href="" id="search_button" class="icon-search" ajxp_message_title_id="184" title="'+MessageHash[184]+'"><img width="16" height="16" align="absmiddle" src="'+ajxpResourcesFolder+'/images/actions/16/search.png" border="0"/></a><span class="search_advanced_direct_access">'+MessageHash[486].toLocaleLowerCase()+' <span class="icon-caret-down"></span></span><a class="mdi mdi-close" href="" id="stop_search_button" ajxp_message_title_id="185" title="'+MessageHash[185]+'"><img width="16" height="16" align="absmiddle" src="'+ajxpResourcesFolder+'/images/actions/16/fileclose.png" border="0" /></a></div><div id="search_results"></div></div>');
if(this._ajxpOptions.toggleResultsVisibility){
this.htmlElement.down("#search_results").insert({before:"<div style='display: none;' id='"+this._ajxpOptions.toggleResultsVisibility+"'></div>"});
this.htmlElement.down("#" + this._ajxpOptions.toggleResultsVisibility).insert(this.htmlElement.down("#search_results"));
Expand Down Expand Up @@ -751,7 +751,7 @@ Class.create("SearchEngine", AjxpPane, {
$('stop_'+this._searchButtonName).removeClassName("disabled");
if(this._ajxpOptions.toggleResultsVisibility){
if(!$(this._ajxpOptions.toggleResultsVisibility).down("div.panelHeader.toggleResults")){
$(this._ajxpOptions.toggleResultsVisibility).insert({top:"<div class='panelHeader toggleResults'><span class='results_string'>Results</span><span class='close_results icon-remove-sign'></span><div id='display_toolbar'></div></div>"});
$(this._ajxpOptions.toggleResultsVisibility).insert({top:"<div class='panelHeader toggleResults'><span class='results_string'>Results</span><span class='close_results mdi mdi-close'></span><div id='display_toolbar'></div></div>"});
this.tb = new ActionsToolbar($(this._ajxpOptions.toggleResultsVisibility).down("#display_toolbar"), {submenuClassName:"panelHeaderMenu",submenuPosition:"bottom right",toolbarsList:["ajxp-search-result-bar"],skipBubbling:true, skipCarousel:true,submenuOffsetTop:2});
this.tb.actionsLoaded({memo:pydio.getController().actions});
this.tb.element.select('a').invoke('show');
Expand Down
4 changes: 2 additions & 2 deletions core/src/plugins/gui.ajax/res/js/ui/reactjs/jsx/ReactFormComponents.js
View file
Expand Up @@ -637,7 +637,7 @@
{icons}
</FileDropzone>
</form>
<div className="binary-remove-button" onClick={this.clearImage}><span key="remove" className="icon-remove-sign"></span> RESET</div>
<div className="binary-remove-button" onClick={this.clearImage}><span key="remove" className="mdi mdi-close"></span> RESET</div>
<iframe style={{display:"none"}} id="uploader_hidden_iframe" name="uploader_hidden_iframe"></iframe>
</div>
);
Expand Down Expand Up @@ -878,7 +878,7 @@
helper = (
<div>
<div className="helper-title">
<span className="helper-close icon-remove-sign" onClick={this.closeHelper}></span>
<span className="helper-close mdi mdi-close" onClick={this.closeHelper}></span>
Pydio Companion
</div>
<div className="helper-content">
Expand Down
4 changes: 2 additions & 2 deletions core/src/plugins/gui.ajax/res/js/ui/reactjs/jsx/ReactPydioComponents.js
View file
Expand Up @@ -92,7 +92,7 @@

var remove;
if(this.props.removable){
remove = <span className="button icon-remove-sign" onClick={this.removeClicked}></span>
remove = <span className="button mdi mdi-close" onClick={this.removeClicked}></span>
}
return connectDragSource(connectDropTarget(
<ReactMUI.Paper zDepth={1} style={{opacity:isDragging?0:1}}>
Expand All @@ -109,7 +109,7 @@
render: function(){
var remove;
if(this.props.removable){
remove = <span className="button icon-remove-sign" onClick={this.removeClicked}></span>
remove = <span className="button mdi mdi-close" onClick={this.removeClicked}></span>
}
return (
<ReactMUI.Paper zDepth={1}>
Expand Down
6 changes: 3 additions & 3 deletions core/src/plugins/gui.ajax/res/js/vendor/prototype/splitter.js
View file
Expand Up @@ -237,7 +237,7 @@ Class.create("Splitter", AjxpPane, {
var options = {
name: oThis.htmlElement.id + '_folding_action',
src:'view_left_close.png',
icon_class:'icon-remove-sign',
icon_class:'mdi mdi-close',
text_id:(oThis.options.foldingButtonText?oThis.options.foldingButtonText:416),
title_id:(oThis.options.foldingButtonText?oThis.options.foldingButtonText:415),
text:MessageHash[(oThis.options.foldingButtonText?oThis.options.foldingButtonText:416)],
Expand Down Expand Up @@ -270,7 +270,7 @@ Class.create("Splitter", AjxpPane, {
var options2 = {
name:'folding_close_action',
src:'view_left_close.png',
icon_class:'icon-remove-sign',
icon_class:'mdi mdi-close',
text_id:416,
title_id:415,
text:MessageHash[416],
Expand Down Expand Up @@ -388,7 +388,7 @@ Class.create("Splitter", AjxpPane, {
}else{
this.getFoldingAction().setIconSrc(
'view_left_'+ (state?'right':'close') + '.png',
(state?(pane == this.paneA?'icon-caret-right':'icon-caret-left'):'icon-remove-sign'));
(state?(pane == this.paneA?'icon-caret-right':'icon-caret-left'):'mdi mdi-close'));
}
if(pane == this.paneA && $(this.paneA).ajxpPaneObject){
$(this.paneA).ajxpPaneObject.resize();
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.

3 changes: 2 additions & 1 deletion core/src/plugins/gui.ajax/res/themes/orbit/css/components/searchengine.less
View file
Expand Up @@ -140,7 +140,8 @@
color: white;
}

.close_results.icon-remove-sign {
.close_results.icon-remove-sign,
.close_results.mdi-close {
position: absolute;
display: inline-block;
right: 13px;
Expand Down
4 changes: 2 additions & 2 deletions core/src/plugins/gui.ajax/res/themes/orbit/css/components/uploaders.less
View file
Expand Up @@ -170,7 +170,7 @@ div#upload_files_list{
margin-right:3px;
}

span.icon-remove-sign, span.icon-ok {
span.icon-remove-sign,span.mdi-close, span.icon-ok {
color: rgba(0,0,0,0.53);
display: block;
position: absolute;
Expand All @@ -180,7 +180,7 @@ div#upload_files_list{
cursor: pointer;
}

span.icon-remove-sign:hover{
span.icon-remove-sign:hover, span.mdi-close:hover{
color: #d00;
}
}
Expand Down
7 changes: 5 additions & 2 deletions core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.css
View file
Expand Up @@ -1990,6 +1990,7 @@ div#upload_files_list span.item-indent {
margin-right: 3px;
}
div#upload_files_list span.icon-remove-sign,
div#upload_files_list span.mdi-close,
div#upload_files_list span.icon-ok {
color: rgba(0, 0, 0, 0.53);
display: block;
Expand All @@ -1999,7 +2000,8 @@ div#upload_files_list span.icon-ok {
top: 2px;
cursor: pointer;
}
div#upload_files_list span.icon-remove-sign:hover {
div#upload_files_list span.icon-remove-sign:hover,
div#upload_files_list span.mdi-close:hover {
color: #d00;
}
div#multiple_download_container div {
Expand Down Expand Up @@ -2720,7 +2722,8 @@ div.selection_ctrl_key {
padding: 15px 10px 10px;
color: white;
}
#search_container #search_results_cont .close_results.icon-remove-sign {
#search_container #search_results_cont .close_results.icon-remove-sign,
#search_container #search_results_cont .close_results.mdi-close {
position: absolute;
display: inline-block;
right: 13px;
Expand Down
12 changes: 9 additions & 3 deletions core/src/plugins/gui.ajax/res/themes/vision/css/ajaxplorer.css
View file
Expand Up @@ -2440,15 +2440,19 @@ div#upload_files_list span.item_relative_path{
display:none;
}

#upload_files_list span.icon-remove-sign {
#upload_files_list span.icon-remove-sign,
#upload_files_list span.mdi.mdi-close
{
color: #ccc;
display: block;
float: right;
margin-right: 10px;
cursor: pointer;
}

#upload_files_list span.icon-remove-sign:hover{
#upload_files_list span.icon-remove-sign:hover,
#upload_files_list span.mdi.mdi-close:hover
{
color: #d00;
}

Expand Down Expand Up @@ -3002,7 +3006,9 @@ span.search_meta_opt.checked > span {
font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
}

.close_results.icon-remove-sign {
.close_results.icon-remove-sign,
.close_results.mdi.mdi-close
{
float: right;
display: inline-block;
padding: 2px 5px;
Expand Down
8 changes: 1 addition & 7 deletions core/src/plugins/gui.mobile/manifest.xml
View file
Expand Up @@ -136,13 +136,7 @@
<div id="topPane" ajxpClass="AjxpPane" ajxpOptions=''>
<div id="navigation_pane" style="position:relative;" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}' >
<div id="navigation_scroller" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height", "fitParent":"ajxp_desktop", "replaceScroller":true}'>
<div id="navigation_bookmarks" ajxp_position="1">
<h3 class="colorcode-bookmark" ajxp_message_id="147">AJXP_MESSAGE[147]
<small id="bookmarks_toggler" class="simple-toggler-show" ajxpClass="VisibilityToggler" ajxpOptions='{"widget_id":"flagged_elements"}'>AJXP_MESSAGE[513]</small>
</h3>
<div style="display:none;" id="flagged_elements" ajxpClass="FetchedResultPane" ajxpOptions='{"replaceScroller":false, "fit":"content", "silentLoading":true, "nodeProviderProperties":{"get_action":"search", "query":"keyword:ajxp_bookmarked"},"reloadOnServerMessage":"tree/reload_bookmarks", "connexion_discrete":true, "containerDroppableAction":"bookmark", "emptyChildrenMessage":515,"clearSelectionOnBlur":true}'></div>
</div>
<div id="navigation_folders" ajxp_position="3">
<div id="navigation_folders">
<h3 class="colorcode-folder" ajxp_message_id="130">AJXP_MESSAGE[130]
<small id="folders_pane_toggler" ajxpClass="VisibilityToggler" ajxpOptions='{"widget_id":"folder_pane", "detection_id":"tree_container"}'>AJXP_MESSAGE[514]</small>
<small onclick="$('folder_pane').toggleClassName('show_first_level');$(this).toggleClassName('expand_button_hide')"><span class='expand_label_show' ajxp_message_id="516">AJXP_MESSAGE[516]</span><span class='expand_label_hide'ajxp_message_id="517">AJXP_MESSAGE[517]</span></small>&nbsp;
Expand Down
4 changes: 2 additions & 2 deletions core/src/plugins/meta.user/class.MetaCellRenderer.js
View file
Expand Up @@ -353,9 +353,9 @@ Class.create("MetaCellRenderer", {
var values = $A(value.split(",")).invoke("strip");
element.update('');
values.each(function(v){
var tag = new Element('span', {className:"meta_user_tag_block"}).update(v + " <span class='icon-remove' style='cursor: pointer;'></span>");
var tag = new Element('span', {className:"meta_user_tag_block"}).update(v + " <span class='mdi mdi-close' style='cursor: pointer;'></span>");
element.insert(tag);
var remove = tag.down(".icon-remove");
var remove = tag.down(".mdi-close");
remove.observe("click", function(){
var conn = new Connexion();
conn.setParameters($H({
Expand Down
2 changes: 1 addition & 1 deletion core/src/plugins/uploader.html/class.XHRUploader.js
View file
Expand Up @@ -523,7 +523,7 @@ Class.create("XHRUploader", {
style : '-moz-border-radius:3px;border-radius:3px;float:left;margin:1px 7px 2px 0px;padding:3px;width:16px;background-position:center top;',
title : MessageHash[257]
});
delButton = new Element("span", {className:"icon-remove-sign"}).update(delButton);
delButton = new Element("span", {className:"mdi mdi-close"}).update(delButton);
delButton.observe("click", function(e){
if(item.xhr){
try{
Expand Down

0 comments on commit cedbfe9

Please sign in to comment.