Index: remoting/webapp/main.html |
diff --git a/remoting/webapp/main.html b/remoting/webapp/main.html |
index 341aa5d788b0adcca8fad55ed662fe21838f88dc..466c1b0ebb88880064e67b8a41d09a30d01099d6 100644 |
--- a/remoting/webapp/main.html |
+++ b/remoting/webapp/main.html |
@@ -15,6 +15,7 @@ found in the LICENSE file. |
<link rel="stylesheet" href="main.css"> |
<link rel="stylesheet" href="menu_button.css"> |
<link rel="stylesheet" href="toolbar.css"> |
+ <script src="butter_bar.js"></script> |
<script src="client_plugin.js"></script> |
<script src="client_plugin_async.js"></script> |
<script src="client_screen.js"></script> |
@@ -41,11 +42,10 @@ found in the LICENSE file. |
<script src="oauth2.js"></script> |
<script src="plugin_settings.js"></script> |
<script src="remoting.js"></script> |
- <script src="session_connector.js"></script> |
<script src="server_log_entry.js"></script> |
+ <script src="session_connector.js"></script> |
<script src="stats_accumulator.js"></script> |
<script src="storage.js"></script> |
- <script src="survey.js"></script> |
<script src="third_party_host_permissions.js"></script> |
<script src="third_party_token_fetcher.js"></script> |
<script src="toolbar.js"></script> |
@@ -89,14 +89,22 @@ found in the LICENSE file. |
</div> |
</header> |
- <div id="survey-opt-in" class="butter-bar" hidden> |
- <p> |
+ <div id="butter-bar" hidden> |
+ <p id="survey-invitation" hidden> |
<span i18n-content="SURVEY_INVITATION"></span> |
<a id="survey-accept" |
href="http://goo.gl/njH2q" |
target="_blank" |
i18n-content="SIGN_ME_UP"></a> |
- <a id="survey-decline" href="#"> |
+ <a id="survey-dismiss" href="#"> |
+ <img src="icon_cross.webp" class="close-icon"></img> |
+ </a> |
+ </p> |
+ <p id="hangouts-invitation" hidden> |
+ <span i18n-content="HANGOUTS_INVITATION" |
+ i18n-value-1="<a id='hangouts-accept' href='https://plus.google.com/hangouts/_?gid=818572447316'>" |
+ i18n-value-2="</a>"></span> |
+ <a id="hangouts-dismiss" href="#"> |
<img src="icon_cross.webp" class="close-icon"></img> |
</a> |
</p> |
@@ -138,15 +146,15 @@ found in the LICENSE file. |
</button> |
</div> |
</div> |
- </div> |
- <div class="section-row"> |
- <div i18n-content="HOME_ACCESS_DESCRIPTION" |
- class="box-spacer"></div> |
- <div> |
- <button id="access-mode-button" |
- i18n-content="HOME_ACCESS_BUTTON" |
- type="button"> |
- </button> |
+ <div class="section-row"> |
+ <div i18n-content="HOME_ACCESS_DESCRIPTION" |
+ class="box-spacer"></div> |
+ <div> |
+ <button id="access-mode-button" |
+ i18n-content="HOME_ACCESS_BUTTON" |
+ type="button"> |
+ </button> |
+ </div> |
</div> |
Jamie
2013/05/23 20:31:46
Why has this block moved in the diff?
Sergey Ulanov
2013/05/29 23:36:11
Moved it back. There is redundant <div> around the
|
</div> |
</div> <!-- it2me-content --> |