Commit 42654b64 authored by henrika@chromium.org's avatar henrika@chromium.org

evert 221691 "Simple refactoring - remove outdated page index"

> Simple refactoring - remove outdated page index 
> 
> BUG=282464
> TBR=ygorshenin@chromium.org 
> NOTRY=true 
> 
> Review URL: https://chromiumcodereview.appspot.com/23571009 

Most likely caused this: http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%282%29/builds/17876/steps/browser_tests/logs/stdio 

TBR=antrim@chromium.org


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221703 0039d316-1c4b-4281-b951-d872f2087c98
parent a23e51a3
......@@ -111,22 +111,22 @@
margin-top: 12px;
}
#managed-user-creation-created .below-marketing {
#managed-user-creation-created-1 .below-marketing {
margin: 20px 40px 0;
}
#managed-user-creation-created-text-1 {
#managed-user-creation-created-1-text-1 {
max-width: 600px;
word-wrap: break-word;
}
#managed-user-creation-created-text-2 {
#managed-user-creation-created-1-text-2 {
margin-top: 20px;
max-width: 600px;
word-wrap: break-word;
}
#managed-user-creation-created-text-3 {
#managed-user-creation-created-1-text-3 {
margin-top: 20px;
}
......
......@@ -82,16 +82,16 @@
</div>
</div>
</div>
<div id="managed-user-creation-created" class="step-no-logo" hidden>
<div id="managed-user-creation-created-1" class="step-no-logo" hidden>
<div class="marketing">
<img src="chrome://theme/IDR_SUPERVISED_ILLUSTRATION_DONE">
</div>
<div class="below-marketing">
<div>
<div id="managed-user-creation-created-text-1"
<div id="managed-user-creation-created-1-text-1"
class="page-title"></div>
<div id="managed-user-creation-created-text-2"></div>
<div id="managed-user-creation-created-text-3"></div>
<div id="managed-user-creation-created-1-text-2"></div>
<div id="managed-user-creation-created-1-text-3"></div>
</div>
</div>
</div>
......
......@@ -473,7 +473,7 @@ login.createScreen('LocallyManagedUserCreationScreen',
'gotit',
'managedUserCreationFlow',
this.gotItButtonPressed_.bind(this),
['created'],
['created-1'],
['custom-appearance', 'button-fancy', 'button-blue']));
return buttons;
},
......@@ -673,10 +673,10 @@ login.createScreen('LocallyManagedUserCreationScreen',
'manager',
'username',
'error',
'created'];
'created-1'];
var pageButtons = {'intro' : 'start',
'error' : 'error',
'created' : 'gotit'};
'created-1' : 'gotit'};
this.hideStatus_();
for (i in pageNames) {
var pageName = pageNames[i];
......@@ -841,7 +841,7 @@ login.createScreen('LocallyManagedUserCreationScreen',
*/
cancel: function() {
var notSignedInPages = ['intro', 'manager'];
var postCreationPages = ['created'];
var postCreationPages = ['created-1'];
if (notSignedInPages.indexOf(this.currentPage_) >= 0) {
// Make sure no manager password is kept:
this.managerList_.clearPods();
......@@ -863,18 +863,18 @@ login.createScreen('LocallyManagedUserCreationScreen',
var managerDisplayId = this.context_.managerDisplayId;
this.updateElementText_('intro-alternate-text',
'createManagedUserIntroAlternateText');
this.updateElementText_('created-text-1',
'createManagedUserCreatedText1',
this.updateElementText_('created-1-text-1',
'createManagedUserCreated1Text1',
this.context_.managedName);
// TODO(antrim): Move wrapping with strong in grd file, and eliminate this
//call.
this.updateElementText_('created-text-2',
'createManagedUserCreatedText2',
this.updateElementText_('created-1-text-2',
'createManagedUserCreated1Text2',
this.wrapStrong(
loadTimeData.getString('managementURL')),
this.context_.managedName);
this.updateElementText_('created-text-3',
'createManagedUserCreatedText3',
this.updateElementText_('created-1-text-3',
'createManagedUserCreated1Text3',
managerDisplayId);
this.updateElementText_('name-explanation',
'createManagedUserNameExplanation',
......@@ -917,7 +917,7 @@ login.createScreen('LocallyManagedUserCreationScreen',
},
showTutorialPage: function() {
this.setVisiblePage_('created');
this.setVisiblePage_('created-1');
},
showErrorPage: function(errorTitle, errorText, errorButtonText) {
......
......@@ -104,11 +104,11 @@ void LocallyManagedUserCreationScreenHandler::DeclareLocalizedValues(
builder->Add("createManagedUserPasswordMismatchError",
IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_MISMATCH_ERROR);
builder->Add("createManagedUserCreatedText1",
builder->Add("createManagedUserCreated1Text1",
IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_1_TEXT_1);
builder->Add("createManagedUserCreatedText2",
builder->Add("createManagedUserCreated1Text2",
IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_1_TEXT_2);
builder->Add("createManagedUserCreatedText3",
builder->Add("createManagedUserCreated1Text3",
IDS_CREATE_LOCALLY_MANAGED_USER_CREATED_1_TEXT_3);
builder->Add("managementURL", chrome::kSupervisedUserManagementDisplayURL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment