Skip to content
Snippets Groups Projects
Commit eca3e2cd authored by Gabriel Engel's avatar Gabriel Engel
Browse files

Merge pull request #3093 from ndarilek/develop 

Replace empty links/clickable divs with <button/> (addresses #3045)
parents dc5157ee 2c059010
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 60 additions and 60 deletions
packages/rocketchat-integrations/client/views/integrationsIncoming.html
+ 3
− 3
View file @ eca3e2cd
......@@ -102,14 +102,14 @@
<div>
<input type="text" name="webhookurl" value="{{data.url}}" readonly="readonly" />
<div class="settings-description">{{_ "Send_your_JSON_payloads_to_this_URL"}}</div>
<div class="settings-description"><a class="clipboard" data-clipboard-target="[name=webhookurl]">{{_ "COPY_TO_CLIPBOARD"}}</a></div>
<div class="settings-description"><button class="clipboard" data-clipboard-target="[name=webhookurl]">{{_ "COPY_TO_CLIPBOARD"}}</button></div>
</div>
</div>
<div class="input-line double-col">
<label>Token</label>
<div>
<input type="text" name="completeToken" value="{{data.completeToken}}" readonly="readonly" />
<div class="settings-description"><a class="clipboard" data-clipboard-target="[name=completeToken]">{{_ "COPY_TO_CLIPBOARD"}}</a></div>
<div class="settings-description"><button class="clipboard" data-clipboard-target="[name=completeToken]">{{_ "COPY_TO_CLIPBOARD"}}</button></div>
</div>
</div>
{{/if}}
......@@ -119,7 +119,7 @@
<pre><code class="hljs json json-example">{{{exampleJson}}}</code></pre>
{{#if curl}}
<input type="text" name="curl" value="{{curl}}" readonly="readonly" />
<div class="settings-description"><a class="clipboard" data-clipboard-target="[name=curl]">{{_ "COPY_TO_CLIPBOARD"}}</a></div>
<div class="settings-description"><button class="clipboard" data-clipboard-target="[name=curl]">{{_ "COPY_TO_CLIPBOARD"}}</button></div>
{{/if}}
</div>
</div>
......
packages/rocketchat-livechat/client/views/app/tabbar/externalSearch.html
+ 1
− 1
View file @ eca3e2cd
......@@ -6,7 +6,7 @@
<div class="external-messages">
{{#each messages}}
<div class="external-message">
<a class="pick-message"><i class="icon-edit"></i></a>
<button class="pick-message"><i class="icon-edit"></i></button>
{{msg}}
</div>
{{/each}}
......
packages/rocketchat-oauth2-server-config/admin/client/views/oauthApp.html
+ 4
− 4
View file @ eca3e2cd
......@@ -31,28 +31,28 @@
<label>{{_ "Client_ID"}}</label>
<div>
<input type="text" name="clientId" value="{{data.clientId}}" readonly="readonly" />
<div class="settings-description"><a class="clipboard" data-clipboard-target="[name=clientId]">{{_ "COPY_TO_CLIPBOARD"}}</a></div>
<div class="settings-description"><button class="clipboard" data-clipboard-target="[name=clientId]">{{_ "COPY_TO_CLIPBOARD"}}</button></div>
</div>
</div>
<div class="input-line double-col">
<label>{{_ "Client_Secret"}}</label>
<div>
<input type="text" name="clientSecret" value="{{data.clientSecret}}" readonly="readonly" />
<div class="settings-description"><a class="clipboard" data-clipboard-target="[name=clientSecret]">{{_ "COPY_TO_CLIPBOARD"}}</a></div>
<div class="settings-description"><button class="clipboard" data-clipboard-target="[name=clientSecret]">{{_ "COPY_TO_CLIPBOARD"}}</button></div>
</div>
</div>
<div class="input-line double-col">
<label>{{_ "Authorization_URL"}}</label>
<div>
<input type="text" name="authorization_url" value="{{data.authorization_url}}" readonly="readonly" />
<div class="settings-description"><a class="clipboard" data-clipboard-target="[name=authorization_url]">{{_ "COPY_TO_CLIPBOARD"}}</a></div>
<div class="settings-description"><button class="clipboard" data-clipboard-target="[name=authorization_url]">{{_ "COPY_TO_CLIPBOARD"}}</button></div>
</div>
</div>
<div class="input-line double-col">
<label>{{_ "Access_Token_URL"}}</label>
<div>
<input type="text" name="access_token_url" value="{{data.access_token_url}}" readonly="readonly" />
<div class="settings-description"><a class="clipboard" data-clipboard-target="[name=access_token_url]">{{_ "COPY_TO_CLIPBOARD"}}</a></div>
<div class="settings-description"><button class="clipboard" data-clipboard-target="[name=access_token_url]">{{_ "COPY_TO_CLIPBOARD"}}</button></div>
</div>
</div>
{{/if}}
......
packages/rocketchat-oauth2-server-config/oauth/client/oauth2-client.html
+ 1
− 1
View file @ eca3e2cd
......@@ -30,7 +30,7 @@
<input type="hidden" name="redirect_uri" value="{{redirect_uri}}">
<input type="hidden" name="response_type" value="code">
<div class="buttons">
<a id="logout-oauth" class="button secondary">{{_ "Logout"}}</a>
<button id="logout-oauth" class="button secondary">{{_ "Logout"}}</button>
<div class="horizontal-space"></div>
<button id="cancel-oauth" type="button" class="button secondary">{{_ "Cancel"}}</button>
<button type="submit" class="button">{{_ "Authorize"}}</button>
......
packages/rocketchat-ui-flextab/flex-tab/tabs/membersList.html
+ 3
− 3
View file @ eca3e2cd
......@@ -8,7 +8,7 @@
<h2>{{_ "Members_List"}}</h2>
<p>
{{{_ "Showing_online_users" total_showing=totalShowing total=total}}}
<a class="see-all">{{seeAll}}</a>
<button class="see-all">{{seeAll}}</button>
</p>
{{> videoButtons}}
{{#if canAddUser}}
......@@ -25,10 +25,10 @@
<ul class='list clearfix lines'>
{{#each users}}
<li class='user-image user-card-room status-{{status}}'>
<a data-username="{{username}}" tabindex="0" title="{{username}}">
<button data-username="{{username}}" tabindex="0" title="{{username}}">
{{> avatar username=username}}
<p>{{username}} {{utcOffset}}</p>
</a>
</button>
</li>
{{/each}}
</ul>
......
packages/rocketchat-ui-login/login/footer.html
+ 1
− 1
View file @ eca3e2cd
<template name='loginFooter'>
<footer>
{{#if LanguageVersion}}<div class="switch-language"><a class="switch-language">{{LanguageVersion}}</a></div>{{/if}}
{{#if LanguageVersion}}<div class="switch-language"><button class="switch-language">{{LanguageVersion}}</button></div>{{/if}}
</footer>
</template>
packages/rocketchat-ui-login/login/form.html
+ 3
− 3
View file @ eca3e2cd
......@@ -44,7 +44,7 @@
</div>
{{#if registrationAllowed}}
<div class="register {{showRegisterLink}}">
<a>{{_ 'Register'}}</a>
<button>{{_ 'Register'}}</button>
</div>
{{else}}
{{#if linkReplacementText}}
......@@ -53,13 +53,13 @@
{{/if}}
{{#if passwordresetAllowed}}
<div class="forgot-password {{showForgotPasswordLink}}">
<a>{{_ 'Forgot_password'}}</a>
<button>{{_ 'Forgot_password'}}</button>
</div>
{{/if}}
{{/if}}
{{/if}}
<div class="back-to-login {{showBackToLoginLink}}">
<a>{{_ 'Back_to_login'}}</a>
<button>{{_ 'Back_to_login'}}</button>
</div>
</form>
<div class='login-terms'>
......
packages/rocketchat-ui-message/message/message.html
+ 10
− 10
View file @ eca3e2cd
......@@ -2,29 +2,29 @@
<li id="{{_id}}" class="message {{isSequential}} {{system}} {{t}} {{own}} {{isTemp}} {{chatops}}" data-username="{{u.username}}" data-groupable="{{isGroupable}}" data-date="{{date}}" data-timestamp="{{timestamp}}">
{{#if avatar}}
{{#if avatarFromUsername}}
<a class="thumb user-card-message" data-username="{{u.username}}" tabindex="1">{{> avatar username=avatarFromUsername}}</a>
<button class="thumb user-card-message" data-username="{{u.username}}" tabindex="1">{{> avatar username=avatarFromUsername}}</button>
{{else}}
<a class="thumb user-card-message" data-username="{{u.username}}" tabindex="1">
<button class="thumb user-card-message" data-username="{{u.username}}" tabindex="1">
<div class="avatar">
<div class="avatar-image" style="background-image:url({{avatar}});"></div>
</div>
</a>
</button>
{{/if}}
{{else}}
{{#if emoji}}
<a class="thumb user-card-message" data-username="{{u.username}}" tabindex="1">
<button class="thumb user-card-message" data-username="{{u.username}}" tabindex="1">
<div class="avatar">
{{{getEmoji emoji}}}
</div>
</a>
</button>
{{else}}
<a class="thumb user-card-message" data-username="{{u.username}}" tabindex="1">{{> avatar username=u.username}}</a>
<button class="thumb user-card-message" data-username="{{u.username}}" tabindex="1">{{> avatar username=u.username}}</button>
{{/if}}
{{/if}}
{{#if alias}}
<a class="user user-card-message" data-username="{{u.username}}" tabindex="1">{{alias}} <span class="message-alias">@{{u.username}}</span></a>
<button class="user user-card-message" data-username="{{u.username}}" tabindex="1">{{alias}} <span class="message-alias">@{{u.username}}</span></button>
{{else}}
<a class="user user-card-message" data-username="{{u.username}}" tabindex="1">{{u.username}}</a>
<button class="user user-card-message" data-username="{{u.username}}" tabindex="1">{{u.username}}</button>
{{/if}}
<span class="info">
{{#each roleTags}}
......@@ -42,9 +42,9 @@
<span class="edited" title='{{_ "edited"}} {{_ "at"}} {{editTime}} {{_ "by"}} {{editedBy}}' >
<i class="icon-edit" aria-label="{{_ "Edited"}}"></i>
{{_ "by"}}
<a class="thumb thumb-small user-card-message" data-username="{{editedBy}}" tabindex="1">
<button class="thumb thumb-small user-card-message" data-username="{{editedBy}}" tabindex="1">
{{> avatar username=editedBy}}
</a>
</button>
</span>
{{else}}
<span class="time">{{time}}</span>
......
packages/rocketchat-ui-sidenav/side-nav/accountBox.html
+ 7
− 7
View file @ eca3e2cd
......@@ -13,18 +13,18 @@
</div>
<nav class="options animated-hidden">
<div class="wrapper">
<a data-status="online" class="status online"><span>{{_ "Online"}}</span></a>
<a data-status="away" class="status away"><span>{{_ "Away" context="male"}}</span></a>
<a data-status="busy" class="status busy"><span>{{_ "Busy" context="male"}}</span></a>
<a data-status="offline" class="status offline"><span>{{_ "Invisible"}}</span></a>
<a id="account" class='account-link'><i class="icon-sliders"></i><span>{{_ "My_Account"}}</span></a>
<button data-status="online" class="status online"><span>{{_ "Online"}}</span></button>
<button data-status="away" class="status away"><span>{{_ "Away" context="male"}}</span></button>
<button data-status="busy" class="status busy"><span>{{_ "Busy" context="male"}}</span></button>
<button data-status="offline" class="status offline"><span>{{_ "Invisible"}}</span></button>
<button id="account" class='account-link'><i class="icon-sliders"></i><span>{{_ "My_Account"}}</span></button>
{{#each registeredMenus}}
<a href="{{pathFor href}}" class="account-box-item"><i class="{{icon}}"></i><span>{{name}}</span></a>
{{/each}}
{{#if showAdminOption }}
<a id="admin" class='account-link'><i class="icon-wrench"></i><span>{{_ "Administration"}}</span></a>
<button id="admin" class='account-link'><i class="icon-wrench"></i><span>{{_ "Administration"}}</span></button>
{{/if}}
<a id="logout"><i class="icon-logout"></i><span>{{_ "Logout"}}</span></a>
<button id="logout"><i class="icon-logout"></i><span>{{_ "Logout"}}</span></button>
</div>
</nav>
{{/with}}
......
packages/rocketchat-ui-sidenav/side-nav/channels.html
+ 1
− 1
View file @ eca3e2cd
......@@ -12,5 +12,5 @@
<p class="empty">{{_ "No_channels_yet" }}</p>
{{/each}}
</ul>
<a class="more more-channels">{{_ "More_channels"}}...</a>
<button class="more more-channels">{{_ "More_channels"}}...</button>
</template>
packages/rocketchat-ui-sidenav/side-nav/directMessages.html
+ 1
− 1
View file @ eca3e2cd
......@@ -9,6 +9,6 @@
{{else}}
<p class="empty">{{_ "No_direct_messages_yet" }}</p>
{{/each}}
<a class="more more-direct-messages">{{_ "More_direct_messages"}}...</a>
<button class="more more-direct-messages">{{_ "More_direct_messages"}}...</button>
</ul>
</template>
packages/rocketchat-ui-sidenav/side-nav/listChannelsFlex.html
+ 1
− 1
View file @ eca3e2cd
......@@ -55,7 +55,7 @@
{{#if hasMore}}
<li class="load-more">
{{#if Template.subscriptionsReady}}
<a>{{_ "Has_more"}}...</a>
<button>{{_ "Has_more"}}...</button>
{{else}}
<div class="load-more-loading">{{_ "Loading..."}}</div>
{{/if}}
......
packages/rocketchat-ui-sidenav/side-nav/listDirectMessagesFlex.html
+ 1
− 1
View file @ eca3e2cd
......@@ -41,7 +41,7 @@
{{#if hasMore}}
<li class="load-more">
{{#if Template.subscriptionsReady}}
<a>{{_ "Has_more"}}...</a>
<button>{{_ "Has_more"}}...</button>
{{else}}
<div class="load-more-loading">{{_ "Loading..."}}</div>
{{/if}}
......
packages/rocketchat-ui-sidenav/side-nav/listPrivateGroupsFlex.html
+ 1
− 1
View file @ eca3e2cd
......@@ -41,7 +41,7 @@
{{#if hasMore}}
<li class="load-more">
{{#if Template.subscriptionsReady}}
<a>{{_ "Has_more"}}...</a>
<button>{{_ "Has_more"}}...</button>
{{else}}
<div class="load-more-loading">{{_ "Loading..."}}</div>
{{/if}}
......
packages/rocketchat-ui-sidenav/side-nav/privateGroups.html
+ 1
− 1
View file @ eca3e2cd
......@@ -13,6 +13,6 @@
{{/each}}
</ul>
{{#if $gt total totalOpen}}
<a class="more more-groups">{{_ "More_groups"}}...</a>
<button class="more more-groups">{{_ "More_groups"}}...</button>
{{/if}}
</template>
packages/rocketchat-ui-sidenav/side-nav/userStatus.html
+ 7
− 7
View file @ eca3e2cd
......@@ -13,15 +13,15 @@
</div>
<nav class="options animated-hidden">
<div class="wrapper">
<a data-status="online" class="status online"><span>{{_ "Online"}}</span></a>
<a data-status="away" class="status away"><span>{{_ "Away" context="male"}}</span></a>
<a data-status="busy" class="status busy"><span>{{_ "Busy" context="male"}}</span></a>
<a data-status="offline" class="status offline"><span>{{_ "Invisible"}}</span></a>
<a id="account" class='account-link'><i class="icon-sliders"></i><span>{{_ "My_Account"}}</span></a>
<button data-status="online" class="status online"><span>{{_ "Online"}}</span></button>
<button data-status="away" class="status away"><span>{{_ "Away" context="male"}}</span></button>
<button data-status="busy" class="status busy"><span>{{_ "Busy" context="male"}}</span></button>
<button data-status="offline" class="status offline"><span>{{_ "Invisible"}}</span></button>
<button id="account" class='account-link'><i class="icon-sliders"></i><span>{{_ "My_Account"}}</span></button>
{{#if showAdminOption }}
<a id="admin" class='account-link'><i class="icon-wrench"></i><span>{{_ "Administration"}}</span></a>
<button id="admin" class='account-link'><i class="icon-wrench"></i><span>{{_ "Administration"}}</span></button>
{{/if}}
<a id="logout"><i class="icon-logout"></i><span>{{_ "Logout"}}</span></a>
<button id="logout"><i class="icon-logout"></i><span>{{_ "Logout"}}</span></button>
</div>
</nav>
{{/with}}
......
packages/rocketchat-ui/views/app/room.html
+ 14
− 14
View file @ eca3e2cd
......@@ -22,19 +22,19 @@
{{#if since}}
{{#if count}}
<div class="unread-bar">
<a class="jump-to">
<button class="jump-to">
<span class="jump-to-large">{{_ "Jump_to_first_unread"}}</span>
<span class="jump-to-small">{{_ "Jump"}}</span>
</a>
</button>
<span class="unread-count-since">
{{_ "S_new_messages_since_s" count formatUnreadSince}}
</span>
<span class="unread-count">
{{_ "N_new_messages" count}}
</span>
<a class="mark-read">
<button class="mark-read">
{{_ "Mark_as_read"}}
</a>
</button>
</div>
{{/if}}
{{/if}}
......@@ -44,17 +44,17 @@
{{#if error}}
<div class="upload-progress-text">
{{error}}
<a>
<button>
{{_ "close"}}
</a>
</button>
</div>
{{else}}
<div class="upload-progress-progress" style="width: {{percentage}}%;"></div>
<div class="upload-progress-text">
{{name}}... {{percentage}}%
<a>
<button>
{{_ "cancel"}}
</a>
</button>
</div>
{{/if}}
</div>
......@@ -69,7 +69,7 @@
{{#if isLoading}}
<div class="load-more-loading">{{_ "Loading_more_from_history"}}...</div>
{{else}}
<a>{{_ "Has_more"}}...</a>
<button>{{_ "Has_more"}}...</button>
{{/if}}
</li>
{{else}}
......@@ -85,19 +85,19 @@
{{#if isLoading}}
<div class="load-more-loading">{{_ "Loading_more_from_history"}}...</div>
{{else}}
<a>{{_ "Has_more"}}...</a>
<button>{{_ "Has_more"}}...</button>
{{/if}}
</li>
{{/if}}
</ul>
</div>
<div class="new-message not">
<button class="new-message not">
<i class="icon-down-big"></i>
<span>{{_ "New_messages"}}</span>
</div>
<div class="jump-recent {{#unless hasMoreNext}}not{{/unless}}">
</button>
<button class="jump-recent {{#unless hasMoreNext}}not{{/unless}}">
<span class="jump-link">{{_ "Jump_to_recent_messages"}} <i class="icon-level-down"></i></span>
</div>
</button>
</div>
<footer class="footer">
{{> messageBox}}
......
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