Refactored i18n and added button for profile deletion

oharsta · oharsta · commit 8459425a8414 · 2013-10-28T20:20:35.000+01:00
diff --git a/application/modules/Profile/View/Index/Index.phtml b/application/modules/Profile/View/Index/Index.phtml
@@ -129,14 +129,7 @@ foreach ($spList as $spId => $sp) {
 <div id="MyApps">
     <p><?php echo $this->t('profile_apps_connected_aps'); ?></p>
     <p>
-        <?php echo $this->t('profile_apps_share',
-            "<a href=\"https://wiki.surfnetlabs.nl/display/conextsupport/Profile+page\" target=\"_blank\">
-                <img src=\"/media/question-mark.jpg\" alt=\"SURFconext Information\">
-            </a>",
-            "<a href=\"https://wiki.surfnetlabs.nl/display/conextsupport/Profile+page\" target=\"_blank\">
-                <img src=\"/media/question-mark.jpg\" alt=\"SURFconext Information\">
-            </a>"
-        ); ?>
+        <?php echo $this->t('profile_apps_share'); ?>
 
     </p>
     <table id="MyAppsTable" class="no-layout-fix">
@@ -223,19 +216,14 @@ foreach ($spList as $spId => $sp) {
 <div id="Exit">
     <p>
         <?php echo $this->t('profile_leave_surfconext_desc'); ?><br />
+        <form id="delete-confirmation-form" method="post" action="/profile/delete-user">
+            <input id="delete-confirmation-text"
+                   type="submit" value="<?php echo $this->t('profile_leave_surfconext_link'); ?>"
+                   data-confirmation-text="<?php echo $this->t('profile_leave_surfconext_conf'); ?>" >
+        </form>
 
         <div class="exit-disclaimer"/>
-        <?php echo $this->t('profile_leave_surfconext_disclaim',
-            "<a href=\"https://wiki.surfnetlabs.nl/display/conextsupport/Profile+page\" target=\"_blank\">
-                <img src=\"/media/question-mark.jpg\" alt=\"SURFconext Information\">
-            </a>",
-            "<a href=\"https://wiki.surfnetlabs.nl/display/conextsupport/SURFteams+Best+Practice\" target=\"_blank\">
-                <img src=\"/media/question-mark.jpg\" alt=\"SURFconext Information\">
-            </a>"
-        ); ?><br />
+            <?php echo $this->t('profile_leave_surfconext_disclaim'); ?><br />
         </div>
-        <a class="delete" href="/profile/delete-user"><?php echo $this->t('profile_leave_surfconext_link'); ?></a>
-        <?php echo $this->t('profile_leave_surfconext_link_add'); ?><br />
-        <input id="delete-confirmation-text" type="hidden" value="<?php echo $this->t('profile_leave_surfconext_conf'); ?>"/>
     </p>
 </div>
diff --git a/bin/makeRelease.sh b/bin/makeRelease.sh
@@ -74,7 +74,7 @@ tar -czf ${PROJECT_DIR_NAME}.tar.gz ${PROJECT_DIR_NAME}
 
 # create checksum file
 cd ${RELEASE_DIR}
-sha1sum ${PROJECT_DIR_NAME}.tar.gz > ${PROJECT_DIR_NAME}.sha
+# sha1sum ${PROJECT_DIR_NAME}.tar.gz > ${PROJECT_DIR_NAME}.sha
 
 # sign it if requested
 if [ -n "$2" ]
diff --git a/languages/en.php b/languages/en.php
@@ -105,25 +105,31 @@
     'profile_header_exit'               => 'Exit',
     'profile_header_auth_needed'        => 'Authentication required',
     'profile_header_leave_surfconext'   => 'Leave SURFconext',
-    'profile_store_info'                => 'The following profile data have been provided by your home institution. These data as well as your group membership data (e.g.SURFteams) will be stored in SURFconext and a subset of this data will be shared with services accessed via SURFconext.',
+    'profile_store_info'                => 'The following profile data have been provided by your home institution. This profile will be stored in (and used by) SURFconext. It is also possible that a subset of this information is provided to services that you accessed via SURFconext.',
     'profile_group_membership_desc'     => 'You are a member of the following groups.',
     'profile_no_groups'                 => 'No Groups',
     'profile_extra_groups_desc'         => 'In order to get extra groups you need to authorize their use.',
-    'profile_leave_surfconext_desc'     => 'You currently use SURFconext to access one or more 3rd party application(s) with your institutional account. In addition, your group membership(s) may be shared with these applications.</p>If you would like to quit using SURFconext and delete your SURFconext profile, please click the link below.',
+    'profile_leave_surfconext_desc'     => 'You currently use SURFconext to access one or more applications with your institutional account. It is possible to delete your SURFconext profile by pressing the button below.',
     'profile_leave_surfconext_link'     => 'Delete my SURFconext account!',
-    'profile_leave_surfconext_disclaim' => 'Please note: You may reassign group%s, document or content ownership to a collegue. Otherwise ongoing projects may be disrupted and/or content may become inaccessible! Consult the deprovisioning and dataportability good practice section%s for more information',
+    'profile_leave_surfconext_disclaim' => 'Note:
+                                            <ul>
+                                                <li>Only information stored in the SURFconext service will be deleted.</li>
+                                                <li>Applications accessed with SURFconext will not be notified. It is possible your personal data is still stored in these applications.</li>
+                                                <li>After a new SURFconext login automatically a new profile is created.</li>
+                                             </ul>
+                                             <br>More information about what information is stored by SURFconext can be found on the <a href="https://wiki.surfnet.nl/display/conextsupport/Profile+page" target="_blank">the SURFconext support pages</a>',
     'profile_leave_surfconext_link_add' => '(close your browser after this action to finalize the deprovisioning procedure)',
     'profile_revoke_access'             => 'Revoke access',
-    'profile_leave_surfconext_conf'     => 'Are you sure you want to delete your profile?',
+    'profile_leave_surfconext_conf'     => 'Are you sure you want to delete your profile? You will need to restart your browser to finalize this action',
     'profile_eula_link'                 => 'Terms of use',
     'profile_support_link'              => 'Support pages',
     'profile_mail_text'                 => 'SURFconext support may ask you to share the above data. This information can help them to answer your support question.',
     'profile_mail_attributes'           => 'Mail data to help@surfconext.nl',
     'profile_mail_send_success'         => 'The mail with your information has been successfully send.',
 
     //Profile MyApps
-    'profile_apps_connected_aps'        => 'Connected Apps and Services',
-    'profile_apps_share'                => 'You have shared your profile%s and optionally group information%s with the following services',
+    'profile_apps_connected_aps'        => 'SURFconext Apps',
+    'profile_apps_share'                => 'You have given permission to share profile information with the following services:',
     'profile_apps_service_th'           => 'Service/App',
     'profile_apps_eula_th'              => 'EULA',
     'profile_apps_support_name_th'      => 'Support person name',
diff --git a/languages/nl.php b/languages/nl.php
@@ -104,26 +104,32 @@
     'profile_header_surfteams'          => 'SURFteams',
     'profile_header_auth_needed'        => 'Authenticatie vereist',
     'profile_header_leave_surfconext'   => 'Verlaat SURFconext',
-    'profile_store_info'                => 'Van uw instelling hebben wij de volgende gegevens ontvangen. Deze gegevens, alsmede uw groepsrelaties, worden opgeslagen in (en gebruikt door) SURFconext. Tevens is het mogelijk dat een subset van deze gegevens worden verstrekt aan diensten die u via SURFconext benadert.',
+    'profile_store_info'                => 'Van jouw instelling hebben wij de volgende gegevens ontvangen. Deze gegevens worden opgeslagen in (en gebruikt door) SURFconext. Tevens is het mogelijk dat een subset van deze gegevens worden verstrekt aan diensten die je via SURFconext benadert.',
 
     'profile_group_membership_desc'     => 'U bent lid van de volgende groepen.',
     'profile_no_groups'                 => 'Geen Groepen',
     'profile_extra_groups_desc'         => 'Om uw instellingsgroepen te zien moet u het gebruik hiervoor binnen SURFconext autoriseren.',
-    'profile_leave_surfconext_desc'     => 'Als u geen gebruik meer wilt maken van SURFconext en alle informatie die over u wordt opgeslagen wilt verwijderen, klik dan op de onderstaande link.',
+    'profile_leave_surfconext_desc'     => 'Je gebruikt SURFconext om met je instellingsaccount in te loggen op een of meerdere applicaties. Je kan je SURFconext profiel verwijderen door op onderstaande knop te drukken.',
     'profile_leave_surfconext_link'     => 'Verwijder mijn profiel!',
-    'profile_leave_surfconext_disclaim' => 'Belangrijk: Je kan group%s, document en content eigenaarschap overzetten naar een collega. Het gevaar bestaat anders dat lopende projecten schade ondervinden en/of content niet meer toegankelijk is. De deprovisioning en dataportability sectien%s beschrijft best practices op dit gebied',
+    'profile_leave_surfconext_disclaim' => 'Let op:
+                                            <ul>
+                                                <li>Alleen de informatie welke in SURFconext wordt opgeslagen zal verwijderd worden.</li>
+                                                <li>Diensten waar je met SURFconext op bent ingelogd zullen niet worden ingelicht. Het is dus mogelijk dat jouw persoonlijke gegevens hier nog opgeslagen zijn.</li>
+                                                <li>Na een nieuwe login via SURFconext zal er automatisch weer een profiel worden aangemaakt.</li>
+                                             </ul>
+                                             <br>Meer informatie over welke informatie er wordt opgeslagen door SURFconext kan je vinden op de <a href="https://wiki.surfnet.nl/display/conextsupport/Profile+page" target="_blank">SURFconext supportpagina\'s</a>.',
     'profile_leave_surfconext_link_add' => '(sluit je browser na deze actie om de deprovisioning procedure te voltooien)',
     'profile_revoke_access'             => 'Trek toegang in',
-    'profile_leave_surfconext_conf'     => 'Weet je zeker dat je je profiel wilt verwijderen?',
+    'profile_leave_surfconext_conf'     => 'Weet je zeker dat je je profiel wilt verwijderen? Je zult je browser moeten afsluiten om deze actie te voltooien',
     'profile_eula_link'                 => 'Gebruikersvoorwaarden',
     'profile_support_link'              => 'Ondersteunings pagina\'s',
     'profile_mail_text'                 => 'SURFconext support kan je vragen om bovenstaande informatie te delen. Deze informatie kan hen helpen om jouw supportvraag te beantwoorden.',
     'profile_mail_attributes'           => 'Mail data naar help@surfconext.nl',
     'profile_mail_send_success'         => 'De mail met bovenstaande informatie is succesvol verstuurd.',
 
     //Profile MyApps
-    'profile_apps_connected_aps'        => 'Beschikbare Apps en Services',
-    'profile_apps_share'                => 'Je kan je profiel%s en eventuele groepen informatie%s delen met de volgende services',
+    'profile_apps_connected_aps'        => 'SURFconext Apps',
+    'profile_apps_share'                => 'Je hebt toestemming gegeven om profielinformatie te delen met de volgende diensten:',
     'profile_apps_service_th'           => 'Service/Applicatie',
     'profile_apps_eula_th'              => 'EULA',
     'profile_apps_support_name_th'      => 'Support contact',
diff --git a/www/authentication/css/wide/screen.css b/www/authentication/css/wide/screen.css
@@ -315,8 +315,6 @@ span.revoke-gp-access {
 }
 
 div.exit-disclaimer {
-	border-style: solid;
-	border-width: 1px;
 	padding: 5px;
 	margin-top: 15px;
 	margin-bottom: 18px;
diff --git a/www/authentication/javascript/profile.js b/www/authentication/javascript/profile.js
@@ -34,8 +34,8 @@ var Profile = function() {
                 autoHeight: false
             });
 
-            $('.delete').click(function() {
-                return confirm('Are you sure you want to delete your profile ?');
+            $('#delete-confirmation-form').submit(function() {
+                return confirm($('#delete-confirmation-text').attr('data-confirmation-text'));
             });
 
             $('.show-details').live('click', function(e){

Original file line number	Diff line number	Diff line change
`@@ -315,8 +315,6 @@ span.revoke-gp-access {`
`315`	`315`	`}`
`316`	`316`
`317`	`317`	`div.exit-disclaimer {`
`318`		`- border-style: solid;`
`319`		`- border-width: 1px;`
`320`	`318`	`padding: 5px;`
`321`	`319`	`margin-top: 15px;`
`322`	`320`	`margin-bottom: 18px;`