Index: ui/file_manager/file_manager/main.html |
diff --git a/ui/file_manager/file_manager/main.html b/ui/file_manager/file_manager/main.html |
index eb7a8008b21353102b0f71955a82b5473b172283..ecc0afb068f4890b3e77b7b1f521a50de02c5f33 100644 |
--- a/ui/file_manager/file_manager/main.html |
+++ b/ui/file_manager/file_manager/main.html |
@@ -28,6 +28,7 @@ |
<link rel="import" href="chrome://resources/polymer/core-icon/core-icon.html"> |
<link rel="import" href="chrome://resources/polymer/core-icons/core-icons.html"> |
+ <link rel="import" href="chrome://resources/polymer/core-icons/social-icons.html"> |
<link rel="import" href="chrome://resources/polymer/core-input/core-input.html"> |
<link rel="import" href="chrome://resources/polymer/paper-button/paper-button.html"> |
<link rel="import" href="chrome://resources/polymer/paper-input/paper-input-decorator.html"> |
@@ -124,7 +125,6 @@ |
<script src="foreground/js/metadata_update_controller.js"></script> |
<script src="foreground/js/naming_controller.js"></script> |
<script src="foreground/js/navigation_list_model.js"></script> |
- <script src="foreground/js/preview_panel_model.js"></script> |
<script src="foreground/js/progress_center_item_group.js"></script> |
<script src="foreground/js/scan_controller.js"></script> |
<script src="foreground/js/search_controller.js"></script> |
@@ -146,7 +146,6 @@ |
<script src="foreground/js/ui/list_container.js"></script> |
<script src="foreground/js/ui/location_line.js"></script> |
<script src="foreground/js/ui/multi_profile_share_dialog.js"></script> |
- <script src="foreground/js/ui/preview_panel.js"></script> |
<script src="foreground/js/ui/progress_center_panel.js"></script> |
<script src="foreground/js/ui/scrollbar.js"></script> |
<script src="foreground/js/ui/search_box.js"></script> |
@@ -302,26 +301,45 @@ |
<div class="dialog-header"> |
<div id="location-breadcrumbs" class="breadcrumbs"></div> |
+ <div id="files-selected-label"></div> |
<div class="spacer"></div> |
- <paper-button id="search-button" tabindex="7"> |
+ <button id="tasks" class="combobutton" menu="#tasks-menu" |
+ tabindex="7"> |
+ <paper-ripple fit></paper-ripple> |
+ </button> |
+ <button id="search-button" class="icon-button" tabindex="8"> |
<core-icon icon="search"></core-icon> |
- </paper-button> |
+ <paper-ripple fit></paper-ripple> |
+ </button> |
<div id="search-box"> |
<paper-input-decorator i18n-values="label:SEARCH_TEXT_LABEL"> |
<input is="core-input" type="search" tabindex="-1" i18n-values="aria-label:SEARCH_TEXT_LABEL"> |
</paper-input-decorator> |
<button class="clear" tabindex="-1"></button> |
</div> |
- <button id="cloud-import-button" tabindex="10" |
+ <button id="share-button" class="icon-button" command="#share" tabindex="9" |
+ i18n-values="aria-label:SHARE_BUTTON_LABEL" |
+ visibleif="full-page"> |
+ <core-icon icon="social:person-add"></core-icon> |
+ <paper-ripple fit></paper-ripple> |
+ </button> |
+ <button id="delete-button" class="icon-button" command="#delete" tabindex="10" |
+ i18n-values="aria-label:DELETE_BUTTON_LABEL" |
+ visibleif="full-page"> |
+ <core-icon icon="delete"></core-icon> |
+ <paper-ripple fit></paper-ripple> |
+ </button> |
+ <button id="cloud-import-button" class="icon-button" tabindex="11" |
i18n-values="aria-label:CLOUD_IMPORT_BUTTON_LABEL" |
style='display: none;'> |
<core-icon icon="cloud-queue"></core-icon> |
<paper-ripple fit></paper-ripple> |
</button> |
- <paper-button id="view-button" tabindex="8"> |
+ <button id="view-button" class="icon-button" tabindex="12"> |
<core-icon icon="view-module"></core-icon> |
- </paper-button> |
- <button id="gear-button" tabindex="9" menu="#gear-menu" |
+ <paper-ripple fit></paper-ripple> |
+ </button> |
+ <button id="gear-button" class="icon-button" tabindex="13" menu="#gear-menu" |
i18n-values="aria-label:GEAR_BUTTON_TOOLTIP" |
aria-activedescendant="gear-menu"> |
<core-icon icon="more-vert"></core-icon> |
@@ -381,39 +399,6 @@ |
</div> |
</div> |
</div> |
- <div class="preview-panel progressable" visibility="hidden"> |
- <div class="left"> |
- <div> |
- <div class="preview-thumbnails"></div> |
- </div> |
- <div id="preview-lines"> |
- <div class="preview-summary"> |
- <span class="preview-text"></span> |
- <span class="calculating-size"></span> |
- </div> |
- </div> |
- </div> |
- <div class="right buttonbar" visibleif="full-page"> |
- <button id="share-button" command="#share" tabindex="11" |
- i18n-values="aria-label:SHARE_BUTTON_LABEL"></button> |
- <button id="tasks" class="combobutton" menu="#tasks-menu" |
- tabindex="12"></button> |
- <button id="delete-button" command="#delete" tabindex="13" |
- i18n-values="aria-label:DELETE_BUTTON_LABEL"></button> |
- </div> |
- <div class="preparing-label" i18n-content="PREPARING_LABEL"></div> |
- <div class="progress-bar"> |
- <div class="progress-track"></div> |
- </div> |
- <div class="right buttonbar" id="open-panel" |
- visibleif="open-file open-multi-file folder upload-folder"> |
- <select class="file-type" hidden></select> |
- <button i18n-content="NEW_FOLDER_BUTTON_LABEL" |
- visibleif="folder" command="#new-folder" tabindex="14"></button> |
- <button class="ok" disabled tabindex="15"></button> |
- <button class="cancel" i18n-content="CANCEL_LABEL" tabindex="16"></button> |
- </div> |
- </div> |
<div id="unmounted-panel"></div> |
<div id="format-panel"> |
<div class="error"></div> |
@@ -423,18 +408,18 @@ |
</div> |
</div> |
<div class="dialog-footer progressable" tabindex="-1" |
- visibleif="saveas-file"> |
+ visibleif="saveas-file open-file open-multi-file folder upload-folder"> |
<div class="left"> |
<button id="new-folder-button" i18n-content="NEW_FOLDER_BUTTON_LABEL" |
visibleif="saveas-file folder" command="#new-folder" |
tabindex="4"> |
</button> |
- <div id="filename-input-box"> |
+ <div id="filename-input-box" visibleif="saveas-file"> |
<div class="filename-label" i18n-content="FILENAME_LABEL"></div> |
<input class="entry-name" type="text" spellcheck="false" tabindex="1"> |
</div> |
<div class="preparing-label" i18n-content="PREPARING_LABEL"></div> |
- <div class="progress-bar"> |
+ <div class="progress-bar" visibleif="saveas-file"> |
<div class="progress-track"></div> |
</div> |
</div> |