Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix onboarding 2 #142

Merged
merged 6 commits into from
Oct 9, 2017
Merged

Fix onboarding 2 #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8684a30
improve abstract settings doc css (#140)
edulix Oct 9, 2017
1f82ce7
fixing onboarding
edulix Oct 9, 2017
b29d79a
fixing onboarding
edulix Oct 9, 2017
c921c05
trying to add intro video
edulix Oct 9, 2017
8a86675
adding width to the oyutubevideo bubble
edulix Oct 9, 2017
3fb73b7
improving video looks
edulix Oct 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions avAdmin/admin-directives/abstract-setting/abstract-setting.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,21 @@
&:hover {
color: #00BF7F;
}

&.headerlink {
display: none;
}
}

img {
margin: 25px;
}

h1 {
background-color: transparent;
}


}
}

Expand Down
9 changes: 2 additions & 7 deletions avAdmin/admin-profile/admin-profile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ angular.module('avAdmin')
fields_def,
user_fields
) {
$window.hopscotch.endTour();

var field;
for (var i = 0; i < fields_def.length; i++) {
field = fields_def[i];
Expand Down Expand Up @@ -75,13 +77,6 @@ angular.module('avAdmin')
var changed = values_changed();
if (false === changed) {
$modalInstance.close();

// launch the onboarding tour if the profile has been correctly
// filled up and the election list is zero
if ($window.electionsTotalCount !== undefined && $window.electionsTotalCount === 0)
{
OnboardingTourService();
}
} else {
$scope.showWorking = true;
Authmethod.updateUserExtra(changed)
Expand Down
1 change: 1 addition & 0 deletions avAdmin/onboarding-tour-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ angular.module('avAdmin')
target: "a[ui-sref='admin.new()']",
highlightTarget: "a[ui-sref='admin.new()']",
placement: "right",
width: 650,
nextOnTargetClick: true,
showNextButton: false
},
Expand Down
2 changes: 1 addition & 1 deletion locales/ca.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
},
"hello_tour": {
"step0_create_title": "Crea la votación",
"step0_create_content": "Comienza a crear una votación de prueba haciendo clic en el botón <strong>Nueva votación</strong>.",
"step0_create_content": "Comienza a crear una votación de prueba haciendo clic en el botón <strong>Nueva votación</strong>. <br><br>O visualiza nuestro video de introducción:<br><iframe width=\"560\" height=\"315\" src=\"https://www.youtube.com/embed/eTZ3TQw5G_c?rel=0&amp;showinfo=0\" frameborder=\"0\" allowfullscreen></iframe>",

"step1_change_title": "Cambiar el título",
"step1_change_content": "Ahora puedes editar todos los detalles de la elección, por ejemplo podrías editar el título de la votación haciendo clic aquí.",
Expand Down
2 changes: 1 addition & 1 deletion locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
},
"hello_tour": {
"step0_create_title": "Create an election",
"step0_create_content": "Start creating a test election clicking in the <strong>New Election</strong> button.",
"step0_create_content": "Start creating a test election clicking in the <strong>New Election</strong> button. <br><br>Or watch the intro video:<br><iframe width=\"560\" height=\"315\" src=\"https://www.youtube.com/embed/eTZ3TQw5G_c?rel=0&amp;showinfo=0\" frameborder=\"0\" allowfullscreen></iframe>",

"step1_change_title": "Change the title",
"step1_change_content": "Now you can edit all the details of the election, for example you could edit the election's title clicking title here.",
Expand Down
2 changes: 1 addition & 1 deletion locales/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
},
"hello_tour": {
"step0_create_title": "Crea la votación",
"step0_create_content": "Comienza a crear una votación de prueba haciendo clic en el botón <strong>Nueva votación</strong>.",
"step0_create_content": "Comienza a crear una votación de prueba haciendo clic en el botón <strong>Nueva votación</strong>. <br><br>O visualiza nuestro video de introducción:<br><iframe width=\"560\" height=\"315\" src=\"https://www.youtube.com/embed/eTZ3TQw5G_c?rel=0&amp;showinfo=0\" frameborder=\"0\" allowfullscreen></iframe>",

"step1_change_title": "Cambiar el título",
"step1_change_content": "Ahora puedes editar todos los detalles de la elección, por ejemplo podrías editar el título de la votación haciendo clic aquí.",
Expand Down
2 changes: 1 addition & 1 deletion locales/gl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
},
"hello_tour": {
"step0_create_title": "Crea la votación",
"step0_create_content": "Comienza a crear una votación de prueba haciendo clic en el botón <strong>Nueva votación</strong>.",
"step0_create_content": "Comienza a crear una votación de prueba haciendo clic en el botón <strong>Nueva votación</strong>. <br><br>O visualiza nuestro video de introducción:<br><iframe width=\"560\" height=\"315\" src=\"https://www.youtube.com/embed/eTZ3TQw5G_c?rel=0&amp;showinfo=0\" frameborder=\"0\" allowfullscreen></iframe>",

"step1_change_title": "Cambiar el título",
"step1_change_content": "Ahora puedes editar todos los detalles de la elección, por ejemplo podrías editar el título de la votación haciendo clic aquí.",
Expand Down