chrome/browser/resources/history/history.html - Issue 15969014: History: Update managed user history page

Side by Side Diff: chrome/browser/resources/history/history.html

Issue 15969014: History: Update managed user history page (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Minor fix Created 7 years, 6 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 | Annotate | Revision Log

OLD	NEW
1 <!DOCTYPE HTML>	1 <!DOCTYPE HTML>

2 <html i18n-values="dir:textdirection;">	2 <html i18n-values="dir:textdirection;">

3 <head>	3 <head>

4 <meta charset="utf-8">	4 <meta charset="utf-8">

5 <if expr="is_android or pp_ifdef('ios')">	5 <if expr="is_android or pp_ifdef('ios')">

6 <meta name="viewport" content="width=device-width, initial-scale=1.0,	6 <meta name="viewport" content="width=device-width, initial-scale=1.0,

7 maximum-scale=1.0, user-scalable=no">	7 maximum-scale=1.0, user-scalable=no">

8 </if>	8 </if>

9 <title i18n-content="title"></title>	9 <title i18n-content="title"></title>

10 <link rel="stylesheet" href="chrome://resources/css/butter_bar.css">	10 <link rel="stylesheet" href="chrome://resources/css/butter_bar.css">

(...skipping 43 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
54 </head>	54 </head>

55	55

56 <if expr="not is_android">	56 <if expr="not is_android">

57 <body class="uber-frame"	57 <body class="uber-frame"

58 i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">	58 i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">

59 </if>	59 </if>

60 <if expr="is_android or pp_ifdef('ios')">	60 <if expr="is_android or pp_ifdef('ios')">

61 <body i18n-values=".style.fontFamily:fontfamily">	61 <body i18n-values=".style.fontFamily:fontfamily">

62 </if>	62 </if>

63	63

64 <div class="page">	64 <div class="page" id="page">
	markusheintz_ 2013/06/05 14:00:06 Please make id the first attribute. Please make id the first attribute. Sergiu 2013/06/05 20:18:41 Done. Show quoted text On 2013/06/05 14:00:06, markusheintz_ wrote: > Please make id the first attribute. Done.
65 <header>	65 <header>

66 <h1 i18n-content="history"></h1>	66 <h1 i18n-content="history"></h1>

67 <div id="search-form" class="search-field-container">	67 <div id="search-form" class="search-field-container">

68 <input type="search" id="search-field" required>	68 <input type="search" id="search-field" required>

69 <input type="submit" id="search-button" i18n-values="value:searchButton">	69 <input type="submit" id="search-button" i18n-values="value:searchButton">

70 </div>	70 </div>

	71 <div id="filter-controls">

	72 <button id="range-today" i18n-content="rangeToday" disabled>

	73 </button>
	James Hawkins 2013/06/04 18:22:05 Can this fit on the line above? Can this fit on the line above? Sergiu 2013/06/05 11:21:37 Done. Show quoted text On 2013/06/04 18:22:05, James Hawkins wrote: > Can this fit on the line above? Done.
	74 <button id="range-previous" disabled>

	75 <img src="../disclosure_triangle_small.png"

	76 i18n-values="alt:rangePrevious">

	77 </button><button id="range-next" disabled>
	James Hawkins 2013/06/04 18:22:05 Why is this next button not on a new line? Why is this next button not on a new line? Sergiu 2013/06/05 11:21:37 Well, this is related to the problem of space betw Show quoted text On 2013/06/04 18:22:05, James Hawkins wrote: > Why is this next button not on a new line? Well, this is related to the problem of space between inline-block elements. If we have whitespace between two inline elements it gets rendered. The possible solutions to this are: 1. Remove the whitespace as above (simplest). 2. I could set a negative margin of -4px instead of -1px so that it covers the whitespace. 3. Probably could use floats/flex-box for this. (most complicated for sure) I went with 1, but if you think that other options are better I'm open to that as well.
	78 <img src="../disclosure_triangle_small.png" i18n-values="alt:rangeNext">

	79 </button>

	80 <div id="display-filter-controls">

	81 <div class="display-filter-button">

	82 <label for="timeframe-filter-all">

	83 <input type="radio" id="timeframe-filter-all"
	James Hawkins 2013/06/04 18:22:05 nit: IDs should be the first attribute. nit: IDs should be the first attribute. Sergiu 2013/06/05 11:21:37 Done. Show quoted text On 2013/06/04 18:22:05, James Hawkins wrote: > nit: IDs should be the first attribute. Done.
	84 name="timeframe-filter" value="0" checked>

	85 <span i18n-content="rangeAllTime" class="first-button-component">

	86 </span>

	87 </label>

	88 </div>

	89 <div class="display-filter-button">

	90 <label for="timeframe-filter-week">

	91 <input type="radio" id="timeframe-filter-week"

	92 name="timeframe-filter" value="1">

	93 <span i18n-content="rangeWeek"></span>

	94 </label>

	95 </div>

	96 <div class="display-filter-button">

	97 <label for="timeframe-filter-month">

	98 <input type="radio" id="timeframe-filter-month"

	99 name="timeframe-filter" value="2">

	100 <span i18n-content="rangeMonth" class="last-button-component">

	101 </span>

	102 </label>

	103 </div>

	104 </div>

	105 </div>

71 </header>	106 </header>

72

73 <div id="filter-controls" hidden>

74 <button id="range-today" i18n-content="rangeToday" disabled>

75 </button>

76 <button id="range-previous" disabled>

77 <img src="../disclosure_triangle_small.png"

78 i18n-values="alt:rangePrevious">

79 </button>

80 <button id="range-next" disabled>

81 <img src="../disclosure_triangle_small.png" i18n-values="alt:rangeNext">

82 </button>

83 <div id="display-filter-controls">

84 <label>

85 <input type="checkbox" id="group-by-domain" name="group-by-domain">

86 <span i18n-content="groupByDomainLabel"></span>

87 </label>

88 <label>

89 <span i18n-content="rangeLabel"></span>

90 <select id="timeframe-filter">

91 <option i18n-content="rangeAllTime" value="0"></option>

92 <option i18n-content="rangeWeek" value="1"></option>

93 <option i18n-content="rangeMonth" value="2"></option>

94 </select>

95 </label>

96 </div>

97 </div>

98 <if expr="not is_android">	107 <if expr="not is_android">

99 <div id="other-devices" class="other-devices"></div>	108 <div id="other-devices" class="other-devices"></div>

100 </if>	109 </if>

101 <div id="top-container">	110 <div id="top-container">

102 <div id="editing-controls">	111 <div id="editing-controls">

103 <button id="clear-browsing-data" i18n-content="clearAllHistory"></button>	112 <button id="clear-browsing-data" i18n-content="clearAllHistory"></button>

104 <button id="remove-selected" disabled="disabled"	113 <button id="remove-selected" disabled="disabled"

105 i18n-content="removeSelected"></button>	114 i18n-content="removeSelected"></button>

106 </div>	115 </div>

107 <div id="notification-bar" hidden></div>	116 <div id="notification-bar" hidden></div>

(...skipping 25 matching lines...) Expand all Loading...
133 <script src="chrome://history-frame/strings.js"></script>	142 <script src="chrome://history-frame/strings.js"></script>

134 <script src="chrome://resources/js/i18n_template2.js"></script>	143 <script src="chrome://resources/js/i18n_template2.js"></script>

135	144

136 <if expr="not is_android and not pp_ifdef('ios')">	145 <if expr="not is_android and not pp_ifdef('ios')">

137 <div id="overlay" class="overlay" hidden>	146 <div id="overlay" class="overlay" hidden>

138 <include src="alert_overlay.html">	147 <include src="alert_overlay.html">

139 </div>	148 </div>

140 </if>	149 </if>

141 </body>	150 </body>

142 </html>	151 </html>

OLD	NEW

« no previous file with comments | « chrome/browser/resources/history/history.css ('k') | chrome/browser/resources/history/history.js » ('j') | chrome/browser/resources/history/history.js » ('J')