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

XWIKI-17111: User profile sections are using <h1> tag for sub-heading #1668

Closed
wants to merge 1 commit into from
Closed

XWIKI-17111: User profile sections are using <h1> tag for sub-heading #1668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...oard/xwiki-platform-dashboard-ui/src/main/resources/Dashboard/XWikiUserDashboardSheet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
#if($xcontext.action == 'view' &amp;&amp; $hasEdit)
&lt;div class="editProfileCategory"&gt;&lt;a href="$doc.getURL('edit', 'category=dashboard')"&gt;&lt;span class="hidden"&gt;$services.localization.render('platform.core.profile.category.dashboard.edit')&lt;/span&gt;&lt;/a&gt;&lt;/div&gt;
#end
&lt;h1&gt;$services.localization.render('platform.dashboard.user.preferences')&lt;/h1&gt;
&lt;h2&gt;$services.localization.render('platform.dashboard.user.preferences')&lt;/h2&gt;
&lt;dl&gt;
&lt;dt class="label"&gt;&lt;label&gt;$services.localization.render('platform.dashboard.user.displayOnMainPage')&lt;/label&gt;&lt;/dt&gt;
&lt;dd&gt;$doc.display('displayOnMainPage', $dashboardPrefs)&lt;/dd&gt;
Expand Down
14 changes: 7 additions & 7 deletions ...ifications-ui/src/main/resources/XWiki/Notifications/Code/XWikiUserNotificationsSheet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,15 +294,15 @@
######################################################
### TITLE
######################################################
= $services.localization.render('notifications.settings.title') =
== $services.localization.render('notifications.settings.title') ==
######################################################
### EMAIL PREFERENCES
######################################################
#if ($services.notification.areEmailsEnabled())
(% class="profile-section highlighted-profile-section notification-top-panel column half" %)
(((
(% id="Hnotifications.settings.email.title" %)
= {{translation key="notifications.settings.email.title" /}} =
=== {{translation key="notifications.settings.email.title" /}} ===
{{notificationsEmailPreferences user="$doc.documentReference" /}}
)))
#end
Expand All @@ -313,7 +313,7 @@
(% class="profile-section highlighted-profile-section notification-top-panel column half" %)
(((
(% id="Hnotifications.settings.watch.title" %)
= {{translation key="notifications.settings.watch.title" /}} =
=== {{translation key="notifications.settings.watch.title" /}} ===
{{notificationsAutoWatchPreferences user="$doc.documentReference" /}}
)))
#end
Expand All @@ -323,7 +323,7 @@
(% class="profile-section highlighted-profile-section column full" %)
(((
(% id="Hnotifications.settings.applications.title" %)
= {{translation key="notifications.settings.applications.title" /}} =
=== {{translation key="notifications.settings.applications.title" /}} ===
{{notificationsApplicationsPreferences user="$doc.documentReference" /}}
)))
######################################################
Expand All @@ -337,18 +337,18 @@
(% class="profile-section highlighted-profile-section column full" %)
(((
(% id="Hnotifications.settings.filters.preferences.system.title" %)
= {{translation key="notifications.settings.filters.preferences.system.title" /}} =
=== {{translation key="notifications.settings.filters.preferences.system.title" /}} ===
{{notificationsSystemFiltersPreferences user="$doc.documentReference" /}}
)))
(% class="profile-section highlighted-profile-section column full" %)
(((
(% id="Hnotifications.settings.filters.preferences.custom.title" %)
= {{translation key="notifications.settings.filters.preferences.custom.title" /}} =
=== {{translation key="notifications.settings.filters.preferences.custom.title" /}} ===
{{notificationsCustomFiltersPreferences user="$doc.documentReference" /}}
)))
#end
{{/velocity}}
</content>
</content>
</property>
<property>
<extensionPointId>org.xwiki.plaftorm.user.profile.menu</extensionPointId>
Expand Down
2 changes: 1 addition & 1 deletion ...file/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserMembershipSheet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
$response.setContentType('application/json')
#else
(% id="user.profile.groups.title" %)
= {{translation key="user.profile.groups.title"/}}
== {{translation key="user.profile.groups.title"/}} ==

{{translation key="user.profile.groups.description"/}}

Expand Down
12 changes: 6 additions & 6 deletions ...profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserNetworkSheet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->

<xwikidoc version="1.1">
<xwikidoc version="1.3" reference="XWiki.XWikiUserNetworkSheet" locale="">
<web>XWiki</web>
<name>XWikiUserNetworkSheet</name>
<language/>
Expand Down Expand Up @@ -551,7 +551,7 @@ require(['jquery', 'xwiki-meta'], function ($, xm) {
<content>{{velocity}}
#set($obj = $doc.getObject('XWiki.XWikiUsers'))
#if(!$obj)
= $services.localization.render('xe.admin.users.sheet') =
== $services.localization.render('xe.admin.users.sheet') ==

{{info}}$services.localization.render('xe.admin.users.applyonusers'){{/info}}##
#else
Expand All @@ -565,7 +565,7 @@ require(['jquery', 'xwiki-meta'], function ($, xm) {
#set ($discard = $xwiki.jsx.use("XWiki.XWikiUserNetworkSheet"))
#set ($discard = $xwiki.ssx.use("XWiki.XWikiUserNetworkSheet"))
{{html}}
&lt;h1&gt;$services.localization.render('platform.core.profile.section.following')&lt;/h1&gt;
&lt;h2&gt;$services.localization.render('platform.core.profile.section.following')&lt;/h2&gt;
#if ($followedUsers.size() &gt; 0)
&lt;ul class="followed-users"&gt;
#foreach ($followedUser in $followedUsers)
Expand All @@ -583,7 +583,7 @@ require(['jquery', 'xwiki-meta'], function ($, xm) {
#end
{{/html}}
#if ($followedUsers.size() &gt; 0)
= $services.localization.render('platform.core.profile.section.networkActivity') =
== $services.localization.render('platform.core.profile.section.networkActivity') ==

{{notifications displayWatchedUsersOnly="true"}}

Expand All @@ -603,7 +603,7 @@ require(['jquery', 'xwiki-meta'], function ($, xm) {
&lt;div class="half column"&gt;
&lt;div class="following profile-section highlighted-profile-section"&gt;
## Please do not insert extra empty lines here (as it affects the validity of the rendered xhtml)
&lt;h1&gt;$services.localization.render('platform.core.profile.section.following')&lt;/h1&gt;
&lt;h2&gt;$services.localization.render('platform.core.profile.section.following')&lt;/h2&gt;
#if (!$followedUsers || $followedUsers.size() == 0)
$services.localization.render('platform.core.profile.section.following.none')
#else
Expand Down Expand Up @@ -633,7 +633,7 @@ require(['jquery', 'xwiki-meta'], function ($, xm) {
#if ($followedUsers.size() &gt; 0)
&lt;div class="half column"&gt;
&lt;div class="networkActivity profile-section"&gt;
&lt;h1&gt;$services.localization.render('platform.core.profile.section.networkActivity')&lt;/h1&gt;
&lt;h2&gt;$services.localization.render('platform.core.profile.section.networkActivity')&lt;/h2&gt;
{{/html}}

{{activity authors="$!{authorsParam}" /}}
Expand Down
10 changes: 5 additions & 5 deletions ...ile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserPreferencesSheet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,17 +281,17 @@
#if($xcontext.action == 'view' &amp;&amp; $hasEdit)
&lt;div class="editProfileCategory"&gt;&lt;a href="$doc.getURL('edit', 'category=preferences')"&gt;&lt;span class="hidden"&gt;$services.localization.render('platform.core.profile.category.preferences.edit')&lt;/span&gt;&lt;/a&gt;&lt;/div&gt;
#end
&lt;h1&gt;$services.localization.render('platform.core.profile.section.displayPreferences')&lt;/h1&gt;
&lt;h2&gt;$services.localization.render('platform.core.profile.section.displayPreferences')&lt;/h2&gt;
&lt;dl&gt;
#displayField('displayHiddenDocuments', 'platform.core.profile.displayHiddenDocuments', '0')
#displayField('accessibility' , 'platform.core.profile.enableAccessibility' , '0')
&lt;/dl&gt;
&lt;h1&gt;$services.localization.render('platform.core.profile.section.localizationPreferences')&lt;/h1&gt;
&lt;h2&gt;$services.localization.render('platform.core.profile.section.localizationPreferences')&lt;/h2&gt;
&lt;dl&gt;
#set ($defaultValue = $xwiki.getXWikiPreference('timezone'))
#displayField('timezone' , 'platform.core.profile.timezone' , $defaultValue)
&lt;/dl&gt;
&lt;h1&gt;$services.localization.render('platform.core.profile.section.editorPreferences')&lt;/h1&gt;
&lt;h2&gt;$services.localization.render('platform.core.profile.section.editorPreferences')&lt;/h2&gt;
&lt;dl&gt;
#set ($defaultValue = $xwiki.getXWikiPreference('editor'))
#if ("$!defaultValue" == '')
Expand All @@ -300,7 +300,7 @@
#displayField('editor' , 'platform.core.profile.editor' , $defaultValue)
#displayField('usertype' , 'platform.core.profile.userType' , 'Simple')
&lt;/dl&gt;
&lt;h1&gt;$services.localization.render('platform.core.profile.section.extensionPreferences')&lt;/h1&gt;
&lt;h2&gt;$services.localization.render('platform.core.profile.section.extensionPreferences')&lt;/h2&gt;
&lt;dl&gt;
#set ($defaultValue = $xwiki.getXWikiPreference('extensionConflictSetup'))
#if ("$!defaultValue" == '')
Expand All @@ -314,7 +314,7 @@
#if(($isMyProfile || $hasAdmin) &amp;&amp; ($xcontext.action == 'view') &amp;&amp; !$doc.getObject('XWiki.LDAPProfileClass'))
&lt;div class="half column"&gt;
&lt;div class="passwordManagement"&gt;
&lt;h1&gt;$services.localization.render('platform.core.profile.section.security')&lt;/h1&gt;
&lt;h2&gt;$services.localization.render('platform.core.profile.section.security')&lt;/h2&gt;
&lt;span class="buttonwrapper"&gt;&lt;a id="changePassword" href="$doc.getURL('view', 'xpage=passwd')"&gt;$services.localization.render('platform.core.profile.changePassword')&lt;/a&gt;&lt;/span&gt;
&lt;/div&gt;
&lt;/div&gt;
Expand Down
6 changes: 3 additions & 3 deletions ...m-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserSheet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,12 +568,12 @@ div.userInfo, div.userPreferences, div.watchlistManagement, div.userDashboard {
.userInfo img {
max-width: 100%;
}
.userInfo h2 {

.userInfo h2, .userPreferences h2, .userDashboard h2, .passwordManagement h2, .profile-section h3 {
font-size: larger;
font-weight: bolder;
}

div.userInfo input[type="text"], div.userInfo input[type="password"], div.userInfo textarea, div.userInfo select, div.userPreferences select {
width: 100%;
}
Expand Down
2 changes: 1 addition & 1 deletion ...-wiki-ui/xwiki-platform-wiki-ui-mainwiki/src/main/resources/WikiManager/UserWikiSheet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ return XWiki;
{{html clean='false'}}
&lt;div class='half column'&gt;
&lt;div class='profile-section highlighted-profile-section'&gt;
&lt;h1&gt;$services.localization.render('platform.wiki.users.profile.joinedwikis.label')&lt;/h1&gt;
&lt;h2&gt;$services.localization.render('platform.wiki.users.profile.joinedwikis.label')&lt;/h2&gt;
#set ($joinedWikis = [])
#set ($wikis = $services.wiki.getAll())
#foreach ($wiki in $wikis)
Expand Down