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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/md_history/app.vulcanized.html

Issue 2570253002: [MD History] Fix toolbar dates in grouped mode. (Closed)
Patch Set: use date interval format Created 3 years, 11 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 unified diff | Download patch
« base/i18n/time_formatting.h ('K') | « chrome/browser/resources/md_history/app.crisper.js ('k') | chrome/browser/resources/md_history/compiled_resources2.gyp » ('j') | chrome/browser/ui/webui/browsing_history_handler.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <html><head><!-- 1 <html><head><!--
2 @license 2 @license
3 Copyright (c) 2014 The Polymer Project Authors. All rights reserved. 3 Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
4 This code may only be used under the BSD style license found at http://polymer.g ithub.io/LICENSE.txt 4 This code may only be used under the BSD style license found at http://polymer.g ithub.io/LICENSE.txt
5 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt 5 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
6 The complete set of contributors may be found at http://polymer.github.io/CONTRI BUTORS.txt 6 The complete set of contributors may be found at http://polymer.github.io/CONTRI BUTORS.txt
7 Code distributed by Google as part of the polymer project is also 7 Code distributed by Google as part of the polymer project is also
8 subject to an additional IP rights grant found at http://polymer.github.io/PATEN TS.txt 8 subject to an additional IP rights grant found at http://polymer.github.io/PATEN TS.txt
9 --><!-- 9 --><!--
10 @license 10 @license
(...skipping 2443 matching lines...) Expand 10 before | Expand all | Expand 10 after
2454 </div> 2454 </div>
2455 <template is="dom-if" if="[[isGroupedMode]]"> 2455 <template is="dom-if" if="[[isGroupedMode]]">
2456 <div id="grouped-buttons-container"> 2456 <div id="grouped-buttons-container">
2457 <paper-tabs attr-for-selected="value" selected="{{groupedRange}}"> 2457 <paper-tabs attr-for-selected="value" selected="{{groupedRange}}">
2458 <paper-tab value="0">$i18n{rangeAllTime}</paper-tab> 2458 <paper-tab value="0">$i18n{rangeAllTime}</paper-tab>
2459 <paper-tab value="1">$i18n{rangeWeek}</paper-tab> 2459 <paper-tab value="1">$i18n{rangeWeek}</paper-tab>
2460 <paper-tab value="2">$i18n{rangeMonth}</paper-tab> 2460 <paper-tab value="2">$i18n{rangeMonth}</paper-tab>
2461 </paper-tabs> 2461 </paper-tabs>
2462 <div id="grouped-nav-container"> 2462 <div id="grouped-nav-container">
2463 <span id="grouped-date"> 2463 <span id="grouped-date">
2464 {{getHistoryInterval_(queryStartTime, queryEndTime)}} 2464 [[getHistoryInterval_(queryInfo)]]
2465 </span> 2465 </span>
2466 <button is="paper-icon-button-light" id="today-button" class="icon-but ton" title="$i18n{rangeToday}" on-tap="onTodayTap_" disabled="[[isToday_(grouped Offset)]]"> 2466 <button is="paper-icon-button-light" id="today-button" class="icon-but ton" title="$i18n{rangeToday}" on-tap="onTodayTap_" disabled="[[isToday_(grouped Offset)]]">
2467 <iron-icon icon="history:today"></iron-icon> 2467 <iron-icon icon="history:today"></iron-icon>
2468 </button> 2468 </button>
2469 <button is="paper-icon-button-light" id="prev-button" title="$i18n{ran gePrevious}" class="icon-button rtl-reversible" on-tap="onPrevTap_" disabled="[[ !hasMoreResults]]"> 2469 <button is="paper-icon-button-light" id="prev-button" title="$i18n{ran gePrevious}" class="icon-button rtl-reversible" on-tap="onPrevTap_" disabled="[[ !hasMoreResults]]">
2470 <iron-icon icon="history:chevron-left"></iron-icon> 2470 <iron-icon icon="history:chevron-left"></iron-icon>
2471 </button> 2471 </button>
2472 <button is="paper-icon-button-light" id="next-button" title="$i18n{ran geNext}" class="icon-button rtl-reversible" on-tap="onNextTap_" disabled="[[isTo day_(groupedOffset)]]"> 2472 <button is="paper-icon-button-light" id="next-button" title="$i18n{ran geNext}" class="icon-button rtl-reversible" on-tap="onNextTap_" disabled="[[isTo day_(groupedOffset)]]">
2473 <iron-icon icon="cr:chevron-right"></iron-icon> 2473 <iron-icon icon="cr:chevron-right"></iron-icon>
2474 </button> 2474 </button>
(...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after
3313 3313
3314 dialog .body { 3314 dialog .body {
3315 white-space: pre-wrap; 3315 white-space: pre-wrap;
3316 } 3316 }
3317 3317
3318 </style> 3318 </style>
3319 <iron-pages id="content" attr-for-selected="id" selected="[[selectedPage_]]" fallback-selection="infinite-list"> 3319 <iron-pages id="content" attr-for-selected="id" selected="[[selectedPage_]]" fallback-selection="infinite-list">
3320 <history-list id="infinite-list" querying="[[queryState.querying]]" search ed-term="[[queryResult.info.term]]"> 3320 <history-list id="infinite-list" querying="[[queryState.querying]]" search ed-term="[[queryResult.info.term]]">
3321 </history-list> 3321 </history-list>
3322 <template is="dom-if" if="[[grouped]]"> 3322 <template is="dom-if" if="[[grouped]]">
3323 <history-grouped-list id="grouped-list" range="[[groupedRange]]" query-s tart-time="[[queryResult.info.queryStartTime]]" query-end-time="[[queryResult.in fo.queryEndTime]]" searched-term="[[queryResult.info.term]]"> 3323 <history-grouped-list id="grouped-list" range="[[groupedRange]]" query-i nterval="[[queryResult.info.queryInterval]]" searched-term="[[queryResult.info.t erm]]">
3324 </history-grouped-list> 3324 </history-grouped-list>
3325 </template> 3325 </template>
3326 </iron-pages> 3326 </iron-pages>
3327 3327
3328 <template is="cr-lazy-render" id="dialog"> 3328 <template is="cr-lazy-render" id="dialog">
3329 <dialog is="cr-dialog"> 3329 <dialog is="cr-dialog">
3330 <div class="title">$i18n{removeSelected}</div> 3330 <div class="title">$i18n{removeSelected}</div>
3331 <div class="body">$i18n{deleteWarning}</div> 3331 <div class="body">$i18n{deleteWarning}</div>
3332 <div class="button-container"> 3332 <div class="button-container">
3333 <paper-button class="cancel-button" on-tap="onDialogCancelTap_"> 3333 <paper-button class="cancel-button" on-tap="onDialogCancelTap_">
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
3769 transition: opacity 500ms; 3769 transition: opacity 500ms;
3770 } 3770 }
3771 3771
3772 :host([toolbar-shadow_]) #drop-shadow { 3772 :host([toolbar-shadow_]) #drop-shadow {
3773 opacity: 1; 3773 opacity: 1;
3774 } 3774 }
3775 3775
3776 </style> 3776 </style>
3777 <history-router selected-page="{{selectedPage_}}" query-state="{{queryState_ }}"> 3777 <history-router selected-page="{{selectedPage_}}" query-state="{{queryState_ }}">
3778 </history-router> 3778 </history-router>
3779 <history-toolbar id="toolbar" grouped-offset="{{queryState_.groupedOffset}}" grouped-range="{{queryState_.range}}" has-drawer="[[hasDrawer_]]" is-grouped-mo de="{{grouped_}}" query-end-time="[[queryResult_.info.queryEndTime]]" has-more-r esults="[[!queryResult_.info.finished]]" query-start-time="[[queryResult_.info.q ueryStartTime]]" querying="[[queryState_.querying]]" search-term="{{queryState_. searchTerm}}" show-menu-promo="[[showMenuPromo_]]" show-sync-notice="[[showSyncN otice_(hasSyncedResults, selectedPage_)]]" spinner-active="[[shouldShowSpinner_( queryState_.querying, 3779 <history-toolbar id="toolbar" grouped-offset="{{queryState_.groupedOffset}}" grouped-range="{{queryState_.range}}" has-drawer="[[hasDrawer_]]" has-more-resu lts="[[!queryResult_.info.finished]]" is-grouped-mode="{{grouped_}}" query-info= "[[queryResult_.info]]" querying="[[queryState_.querying]]" search-term="{{query State_.searchTerm}}" show-menu-promo="[[showMenuPromo_]]" show-sync-notice="[[sh owSyncNotice_(hasSyncedResults, selectedPage_)]]" spinner-active="[[shouldShowSp inner_(queryState_.querying,
3780 queryState_.incremental, 3780 queryState_.incremental,
3781 queryState_.searchTerm)]]"> 3781 queryState_.searchTerm)]]">
3782 </history-toolbar> 3782 </history-toolbar>
3783 3783
3784 <div id="main-container"> 3784 <div id="main-container">
3785 <history-side-bar id="content-side-bar" selected-page="{{selectedPage_}}" show-footer="[[showSidebarFooter]]" hidden$="[[hasDrawer_]]"> 3785 <history-side-bar id="content-side-bar" selected-page="{{selectedPage_}}" show-footer="[[showSidebarFooter]]" hidden$="[[hasDrawer_]]">
3786 </history-side-bar> 3786 </history-side-bar>
3787 <iron-pages id="content" attr-for-selected="path" fallback-selection="hist ory" selected="[[getSelectedPage_(selectedPage_, items)]]" items="{{items}}"> 3787 <iron-pages id="content" attr-for-selected="path" fallback-selection="hist ory" selected="[[getSelectedPage_(selectedPage_, items)]]" items="{{items}}">
3788 <history-list-container id="history" query-state="{{queryState_}}" query -result="[[queryResult_]]" grouped="[[grouped_]]" grouped-range="{{queryState_.r ange}}" path="history"> 3788 <history-list-container id="history" query-state="{{queryState_}}" query -result="[[queryResult_]]" grouped="[[grouped_]]" grouped-range="{{queryState_.r ange}}" path="history">
3789 </history-list-container> 3789 </history-list-container>
(...skipping 13 matching lines...) Expand all
3803 <history-side-bar id="drawer-side-bar" selected-page="{{selectedPage_}}" show-footer="[[showSidebarFooter]]" drawer=""> 3803 <history-side-bar id="drawer-side-bar" selected-page="{{selectedPage_}}" show-footer="[[showSidebarFooter]]" drawer="">
3804 </history-side-bar> 3804 </history-side-bar>
3805 </app-drawer> 3805 </app-drawer>
3806 </template> 3806 </template>
3807 3807
3808 <iron-media-query query="(max-width: 1023px)" query-matches="{{hasDrawer_}}" > 3808 <iron-media-query query="(max-width: 1023px)" query-matches="{{hasDrawer_}}" >
3809 </iron-media-query> 3809 </iron-media-query>
3810 </template> 3810 </template>
3811 </dom-module> 3811 </dom-module>
3812 <script src="app.crisper.js"></script></body></html> 3812 <script src="app.crisper.js"></script></body></html>
OLDNEW
« base/i18n/time_formatting.h ('K') | « chrome/browser/resources/md_history/app.crisper.js ('k') | chrome/browser/resources/md_history/compiled_resources2.gyp » ('j') | chrome/browser/ui/webui/browsing_history_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698