Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2449)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/chromeos/wallpaper_manager/main.html

Issue 12334030: New custom wallpaper picker UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add bug reference Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js ('k') | chrome/browser/resources/chromeos/wallpaper_manager/manifest.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/chromeos/wallpaper_manager/main.html
diff --git a/chrome/browser/resources/chromeos/wallpaper_manager/main.html b/chrome/browser/resources/chromeos/wallpaper_manager/main.html
index be82a347c785d41d5c0938faf45132e809ca30af..be82b3f600b6e26c026f4db02ce8a7b30e6454bf 100644
--- a/chrome/browser/resources/chromeos/wallpaper_manager/main.html
+++ b/chrome/browser/resources/chromeos/wallpaper_manager/main.html
@@ -30,6 +30,7 @@ found in the LICENSE file.
<script src="../../../../../ui/webui/resources/js/cr/ui/list.js"></script>
<script src="../../../../../ui/webui/resources/js/cr/ui/grid.js"></script>
<script src="js/progress_manager.js"></script>
+ <script src="js/wallpaper_directories.js"></script>
<script src="js/wallpaper_images_grid.js"></script>
<script src="js/wallpaper_manager.js"></script>
<script src="js/main.js"></script>
@@ -37,13 +38,32 @@ found in the LICENSE file.
</head>
<body i18n-values=".style.fontFamily:webFontFamily;
.style.fontSize:webFontSize">
- <div id="error-container" hidden>
+ <div id="error-container" class="overlay-container" hidden>
<div class="page">
- <div id="close-error"></div>
+ <div id="close-error" class="close-overlay"></div>
<span class="error-message"></span>
<a id="learn-more" i18n-content="learnMore" target="_blank"></a>
</div>
</div>
+ <div id="wallpaper-selection-container" class="overlay-container" hidden>
+ <div class="page">
+ <div id="close-wallpaper-selection" class="close-overlay"></div>
+ <div id="content">
+ <input id="file-selector" type="file" size="80" accept="image/jpeg">
+ <div i18n-content="positionLabel"></div>
+ <select id="set-wallpaper-layout" disabled>
+ <option value="CENTER" i18n-content="centerLayout"></option>
+ <option selected="selected" value="CENTER_CROPPED"
+ i18n-content="centerCroppedLayout"></option>
+ <option value="STRETCH" i18n-content="stretchLayout"></option>
+ </select>
+ <div id="warning">
+ <img class="remember-icon">
+ <span i18n-content="customWallpaperWarning"></span>
+ </div>
+ </div>
+ </div>
+ </div>
<div class="dialog-container">
<div class="dialog-topbar">
<div id="navstrip">
@@ -60,34 +80,22 @@ found in the LICENSE file.
<div class="progress-track"></div>
</div>
<div class="bottom-bar">
- <img id="attribute-image" hidden>
- <div id="wallpaper-attribute" hidden>
- <div>
- <label>
- <span id="author-name"></span>
- </label>
- </div>
- <div>
- <a id="author-website" target="_blank"></a>
+ <div id="online-wallpaper-attribute">
+ <img id="attribute-image" hidden>
+ <div id="wallpaper-attribute" hidden>
+ <div>
+ <label>
+ <span id="author-name"></span>
+ </label>
+ </div>
+ <div>
+ <a id="author-website" target="_blank"></a>
+ </div>
</div>
</div>
<div class="spacer"></div>
</div>
</div>
- <div id="custom-container" hidden>
- <div i18n-content="selectCustomLabel"></div>
- <input id="file-selector" type="file" accept="image/jpeg">
- <div i18n-content="customWallpaperWarning"></div>
- <div i18n-content="positionLabel"></div>
- <select id="set-wallpaper-layout">
- <option value="CENTER" i18n-content="centerLayout"></option>
- <option selected="selected" value="CENTER_CROPPED"
- i18n-content="centerCroppedLayout"></option>
- <option value="STRETCH" i18n-content="stretchLayout"></option>
- </select>
- <div i18n-content="previewLabel"></div>
- <img id="preview">
- </div>
</div>
</div>
</body>
« no previous file with comments | « chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js ('k') | chrome/browser/resources/chromeos/wallpaper_manager/manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698