From 6858348b50babe203e1d9be42e4fbe4d06feadf2 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Fri, 7 May 2021 15:27:46 +0800 Subject: [PATCH 1/2] Upgrade Bootstrap 5 --- README.md | 4 +- .../profile_card_component.html.erb | 10 +- app/controllers/replies_controller.rb | 2 +- app/helpers/application_helper.rb | 4 +- app/helpers/likes_helper.rb | 2 +- app/helpers/topics_helper.rb | 2 +- app/helpers/users_helper.rb | 4 +- app/javascript/admin/index.scss | 11 +- app/javascript/front/app.js | 3 - app/javascript/front/editor.js | 74 ++- app/javascript/front/emoji-modal.js | 79 ++- app/javascript/front/index.scss | 9 +- app/javascript/front/notifier.js | 44 +- app/javascript/front/toc.js | 4 +- app/javascript/front/users.scss | 6 +- app/javascript/homeland/_vars.scss | 21 +- app/javascript/homeland/dark-mode.scss | 16 +- app/javascript/homeland/index.js | 15 +- app/javascript/homeland/index.scss | 116 +++- app/views/admin/applications/index.html.erb | 37 +- app/views/admin/applications/show.html.erb | 4 +- app/views/admin/comments/index.html.erb | 22 +- app/views/admin/dashboards/index.html.erb | 32 +- app/views/admin/locations/index.html.erb | 17 +- app/views/admin/nodes/_form.html.erb | 6 +- app/views/admin/nodes/index.html.erb | 25 +- app/views/admin/photos/index.html.erb | 19 +- app/views/admin/plugins/index.html.erb | 6 +- app/views/admin/plugins/new.html.erb | 4 +- app/views/admin/plugins/show.html.erb | 2 +- app/views/admin/replies/edit.html.erb | 6 +- app/views/admin/replies/index.html.erb | 51 +- app/views/admin/site_configs/_form.html.erb | 6 +- app/views/admin/topics/_form.html.erb | 6 +- app/views/admin/topics/edit.html.erb | 6 +- app/views/admin/topics/index.html.erb | 68 +- app/views/admin/users/_form.html.erb | 104 ++- app/views/admin/users/_user.html.erb | 21 +- app/views/admin/users/edit.html.erb | 24 +- app/views/admin/users/index.html.erb | 20 +- app/views/devise/registrations/new.html.erb | 2 +- app/views/devise/sessions/new.html.erb | 4 +- .../doorkeeper/applications/_form.html.erb | 20 +- .../doorkeeper/applications/index.html.erb | 4 +- app/views/layouts/application.html.erb | 16 +- app/views/layouts/mailer.html.erb | 110 ++-- app/views/layouts/simple.html.erb | 6 +- app/views/notifications/_team_invite.html.erb | 2 +- .../notifications/index.html.erb | 2 +- app/views/replies/edit.html.erb | 9 +- app/views/settings/account.html.erb | 24 +- app/views/settings/password.html.erb | 6 +- app/views/settings/profile.html.erb | 10 +- app/views/settings/reward.html.erb | 22 +- app/views/settings/show.html.erb | 53 +- app/views/shared/_captcha_input.html.erb | 4 +- app/views/shared/_editor_help_block.html.erb | 44 +- app/views/shared/_editor_toolbar.html.erb | 12 +- app/views/shared/_error_messages.html.erb | 8 +- app/views/shared/_usernav.html.erb | 8 +- app/views/team_users/_form.html.erb | 22 +- app/views/team_users/edit.html.erb | 10 +- app/views/team_users/index.html.erb | 4 +- app/views/team_users/new.html.erb | 12 +- app/views/team_users/show.html.erb | 3 +- app/views/teams/edit.html.erb | 8 +- app/views/topics/_ban.html.erb | 40 +- app/views/topics/_buttons.html.erb | 3 +- app/views/topics/_form.html.erb | 18 +- app/views/topics/_menu.html.erb | 8 +- app/views/topics/_node_info.html.erb | 2 +- app/views/topics/_topic_sidebar.html.erb | 6 +- app/views/users/_menu.html.erb | 2 +- app/views/users/_reward.html.erb | 2 +- app/views/users/_sidebar.html.erb | 10 +- config/initializers/bootstrap_form.rb | 37 ++ config/locales/views.en.yml | 2 +- config/locales/views.zh-CN.yml | 2 +- lib/assets/javascripts/jquery.fluidbox.min.js | 219 ++++++- .../javascripts/jquery.infinitescroll.min.js | 604 +++++++++++++++++- lib/templates/erb/scaffold/show.html.erb | 14 +- package.json | 9 +- test/helpers/application_helper_test.rb | 2 +- test/helpers/likes_helper_test.rb | 2 +- test/helpers/users_helper_test.rb | 4 +- test/lib/markdown_test.rb | 2 +- yarn.lock | 50 +- 87 files changed, 1613 insertions(+), 762 deletions(-) create mode 100644 config/initializers/bootstrap_form.rb diff --git a/README.md b/README.md index a3fcf4a8ef..9c334c1ffd 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@

- +

Open source discussion website.

开源的论坛／社区网站系统，基于 Ruby China 发展而来。

- +

diff --git a/app/components/profile_card_component.html.erb b/app/components/profile_card_component.html.erb index e06779c23a..3b0eb57d44 100644 --- a/app/components/profile_card_component.html.erb +++ b/app/components/profile_card_component.html.erb @@ -1,9 +1,9 @@
-
+
<%= user_avatar_tag(user, :md) %>
-
+
<%= link_to user, class: "name-box" do %>
<%= user.name %> @@ -17,7 +17,7 @@ <% if user.tagline.present? %>
<%= user.tagline %>
<% end %> -
+
<% end %> <% if !owner? user %> -
+
<%= follow_user_tag(user) %>
<% end %> -
\ No newline at end of file +
diff --git a/app/controllers/replies_controller.rb b/app/controllers/replies_controller.rb index 8d2c8da872..248dba2f21 100644 --- a/app/controllers/replies_controller.rb +++ b/app/controllers/replies_controller.rb @@ -15,7 +15,7 @@ def create current_user.read_topic(@topic) @msg = t("replies.created_successfully") else - @msg = @reply.errors.full_messages.join("
") + @msg = @reply.errors.full_messages.join("
") end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ce62cc54fe..5a1fc6e681 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -16,7 +16,7 @@ def sanitize_markdown(html) def notice_message flash_messages = [] - close_html = %() + close_html = %() flash.each do |type, message| type = :success if type.to_sym == :notice @@ -154,7 +154,7 @@ def form_group(form, field, opts = {}, &block) opts[:class] += " has-error" if has_errors content_tag :div, class: opts[:class] do - concat form.label field, class: "control-label" if opts[:label] != false + concat form.label field, class: "form-label" if opts[:label] != false concat capture(&block) concat errors_for(form, field) end diff --git a/app/helpers/likes_helper.rb b/app/helpers/likes_helper.rb index 57e2d5283d..7fabcb2e7c 100644 --- a/app/helpers/likes_helper.rb +++ b/app/helpers/likes_helper.rb @@ -6,7 +6,7 @@ module LikesHelper # params # - likeable - Like target # - :cache - when true, will not check current user is liked, directly return no like status for cache. - # - :class - Add class for link, for example: "btn btn-default" + # - :class - Add class for link, for example: "btn btn-secondary" def likeable_tag(likeable, opts = {}) return "" if likeable.blank? diff --git a/app/helpers/topics_helper.rb b/app/helpers/topics_helper.rb index 843fde9a99..82da137cb0 100644 --- a/app/helpers/topics_helper.rb +++ b/app/helpers/topics_helper.rb @@ -50,7 +50,7 @@ def topic_excellent_tag(topic) def topic_close_tag(topic) return "" unless topic.closed? - content_tag(:i, "", title: t("topics.closed_tooltip"), class: "fa fa-check-circle", data: {toggle: "tooltip"}) + content_tag(:i, "", title: t("topics.closed_tooltip"), class: "fa fa-check-circle", "data-bs-toggle": "tooltip") end def render_node_name(node) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 2f656a95d8..0ceb755ae7 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -72,7 +72,7 @@ def block_node_tag(node) return "" if node.blank? blocked = current_user.block_node?(node) - class_names = "btn btn-default button-block-node" + class_names = "btn btn-secondary button-block-node" if blocked link_to icon_tag("eye-slash", label: t("common.unblock_node")), "#", "data-id" => node.id, :class => "#{class_names} active" @@ -87,7 +87,7 @@ def block_user_tag(user) return "" if current_user.id == user.id blocked = current_user.block_user?(user) - class_names = "button-block-user btn btn-default btn-block" + class_names = "button-block-user btn btn-secondary btn-block" if blocked link_to icon_tag("eye-slash", label: t("common.unblock_user")), "#", "data-id" => user.login, :class => "#{class_names} active" diff --git a/app/javascript/admin/index.scss b/app/javascript/admin/index.scss index b618cd76b6..d4011b6d86 100644 --- a/app/javascript/admin/index.scss +++ b/app/javascript/admin/index.scss @@ -88,8 +88,13 @@ pre { margin-bottom: 15px; .form-inline { - .form-group { - margin-right: 10px; + @extend .d-grid; + @extend .gap-2; + @extend .d-sm-block; + @extend .d-md-flex; + + .form-control { + width: auto; } } } @@ -115,7 +120,7 @@ table { .badge { color: var(--gray); border-radius: 12px; - border: 1px solid var(--btn-default-border-color); + border: 1px solid var(--btn-secondary-border-color); font-size: 12px; font-weight: normal; } diff --git a/app/javascript/front/app.js b/app/javascript/front/app.js index b302cc4f74..336f44b5de 100644 --- a/app/javascript/front/app.js +++ b/app/javascript/front/app.js @@ -40,9 +40,6 @@ const AppView = Backbone.View.extend({ initComponents() { $("abbr.timeago").timeago(); - $(".alert").alert(); - $(".dropdown-toggle").dropdown(); - $('[data-toggle="tooltip"]').tooltip(); // Bind Ctrl+Enter for submit $(".cell_comments_new textarea").unbind("keydown"); diff --git a/app/javascript/front/editor.js b/app/javascript/front/editor.js index cede9037f7..63cf095937 100644 --- a/app/javascript/front/editor.js +++ b/app/javascript/front/editor.js @@ -1,10 +1,10 @@ window.Editor = Backbone.View.extend({ - el: '.editor-toolbar', + el: ".editor-toolbar", events: { "click #editor-upload-image": "browseUpload", "click .insert-codes a": "appendCodesFromHint", - "click .pickup-emoji": "pickupEmoji" + "click .pickup-emoji": "pickupEmoji", }, initialize(opts) { @@ -16,23 +16,23 @@ window.Editor = Backbone.View.extend({ let dropzone; const self = this; const editor = $("textarea.topic-editor"); - editor.wrap("
"); + editor.wrap('
'); - const editor_dropzone = $('.topic-editor-dropzone'); - editor_dropzone.on('paste', event => { + const editor_dropzone = $(".topic-editor-dropzone"); + editor_dropzone.on("paste", (event) => { return self.handlePaste(event); }); - return dropzone = editor_dropzone.dropzone({ + return (dropzone = editor_dropzone.dropzone({ url: "/photos", dictDefaultMessage: "", clickable: true, paramName: "file", maxFilesize: 20, uploadMultiple: false, - acceptedFiles: 'image/*', + acceptedFiles: "image/*", headers: { - "X-CSRF-Token": $("meta[name=\"csrf-token\"]").attr("content") + "X-CSRF-Token": $('meta[name="csrf-token"]').attr("content"), }, previewContainer: false, processing() { @@ -53,20 +53,20 @@ window.Editor = Backbone.View.extend({ self.appendImageFromUpload(res.url); }, error(temp, msg) { - if (typeof msg === "string") { // from client side + if (typeof msg === "string") { + // from client side App.alert(msg); - } else { // from server side - App.alert(msg.message) + } else { + // from server side + App.alert(msg.message); } }, - totaluploadprogress(num) { - }, - sending() { - }, + totaluploadprogress(num) {}, + sending() {}, queuecomplete() { self.restoreUploaderStatus(); - } - }); + }, + })); }, uploadFile(item, filename) { @@ -74,7 +74,7 @@ window.Editor = Backbone.View.extend({ const formData = new FormData(); formData.append("file", item, filename); return $.ajax({ - url: '/photos', + url: "/photos", type: "POST", data: formData, dataType: "JSON", @@ -93,7 +93,7 @@ window.Editor = Backbone.View.extend({ }, complete() { return self.restoreUploaderStatus(); - } + }, }); }, @@ -123,12 +123,12 @@ window.Editor = Backbone.View.extend({ browseUpload(e) { $(".topic-editor").focus(); - $('.topic-editor-dropzone').click(); + $(".topic-editor-dropzone").click(); return false; }, showUploading() { - const btn = $("#editor-upload-image") + const btn = $("#editor-upload-image"); btn.addClass("active"); }, @@ -144,16 +144,17 @@ window.Editor = Backbone.View.extend({ // 往编辑器里面的光标前插入两个空白字符 insertSpaces(e) { - this.insertString(' '); + this.insertString(" "); return false; }, // 往编辑器里面插入代码模版 appendCodesFromHint(e) { - const link = $(e.currentTarget); - const language = link.data("lang"); + const link = e.currentTarget; + const language = link.getAttribute("data-lang"); + const txtBox = $(".topic-editor"); - const caret_pos = txtBox.caret('pos'); + const caret_pos = txtBox.caret("pos"); let prefix_break = ""; if (txtBox.val().length > 0) { prefix_break = "\n"; @@ -161,10 +162,15 @@ window.Editor = Backbone.View.extend({ const src_merged = `${prefix_break}\`\`\`${language}\n\n\`\`\`\n`; const source = txtBox.val(); const before_text = source.slice(0, caret_pos); - txtBox.val(before_text + src_merged + source.slice(caret_pos + 1, source.count)); - txtBox.caret('pos', (caret_pos + src_merged.length) - 5); + txtBox.val( + before_text + src_merged + source.slice(caret_pos + 1, source.count) + ); + txtBox.caret("pos", caret_pos + src_merged.length - 5); txtBox.focus(); - txtBox.trigger('click'); + txtBox.trigger("click"); + + // click body to dismiss dropdown + document.querySelector("body").click(); return false; }, @@ -172,28 +178,28 @@ window.Editor = Backbone.View.extend({ const $target = $(".topic-editor"); const start = $target[0].selectionStart; const end = $target[0].selectionEnd; - $target.val($target.val().substring(0, start) + str + $target.val().substring(end)); - $target[0].selectionStart = ($target[0].selectionEnd = start + str.length); + $target.val( + $target.val().substring(0, start) + str + $target.val().substring(end) + ); + $target[0].selectionStart = $target[0].selectionEnd = start + str.length; return $target.focus(); }, initComponents() { // 绑定文本框 tab 按键事件 $("textarea.topic-editor").unbind("keydown.tab"); - $("textarea.topic-editor").bind("keydown.tab", "tab", el => { + $("textarea.topic-editor").bind("keydown.tab", "tab", (el) => { return this.insertSpaces(el); }); return $("textarea.topic-editor").autogrow(); }, - pickupEmoji() { if (!window._emojiModal) { window._emojiModal = new EmojiModalView(); } window._emojiModal.show(); return false; - } + }, }); - diff --git a/app/javascript/front/emoji-modal.js b/app/javascript/front/emoji-modal.js index 7fb3975ae4..dcffa7ad70 100644 --- a/app/javascript/front/emoji-modal.js +++ b/app/javascript/front/emoji-modal.js @@ -1,14 +1,14 @@ -import { EMOJI_LIST, EMOJI_GROUPS } from './emoji-data'; +import { EMOJI_LIST, EMOJI_GROUPS } from "./emoji-data"; window.EmojiModalView = Backbone.View.extend({ - className: 'emoji-modal modal', + className: "emoji-modal modal", panels: {}, events: { "click .tab-pane a.emoji": "insertCode", "mouseover .tab-pane a.emoji": "preview", - "click .nav-tabs li a": "changePanel" + "click .nav-tabs li a": "changePanel", }, initialize() { @@ -18,7 +18,7 @@ window.EmojiModalView = Backbone.View.extend({
- +
@@ -37,15 +37,18 @@ window.EmojiModalView = Backbone.View.extend({ }, activeFirstPanel() { - this.$el.find('.nav-tabs li a').first().addClass('active'); - const firstGroupName = this.$el.find('.nav-tabs li a').first().data("group"); + this.$el.find(".nav-tabs li a").first().addClass("active"); + const firstGroupName = this.$el + .find(".nav-tabs li a") + .first() + .data("group"); const tabPane = this.$el.find(`#emoji-group-${firstGroupName}`); tabPane.html(this.panels[firstGroupName]); return tabPane.addClass("active"); }, findEmojiUrlByName(name) { - const emoji = _.find(EMOJI_LIST, emoji => emoji.code === `:${name}:`); + const emoji = _.find(EMOJI_LIST, (emoji) => emoji.code === `:${name}:`); if (!emoji) { return ""; } @@ -54,14 +57,18 @@ window.EmojiModalView = Backbone.View.extend({ addGroup(group) { this.renderGroupHTML(group); - if (group.name === 'favorites') { - if (group.icons.length === 0) { return false; } + if (group.name === "favorites") { + if (group.icons.length === 0) { + return false; + } } const navTab = `
  • - + data-bs-toggle ="tab"> +
    • `; const navPanel = ` @@ -69,33 +76,35 @@ window.EmojiModalView = Backbone.View.extend({
    `; - this.$el.find('.nav-tabs').append(navTab); - return this.$el.find('.tab-content').append(navPanel); + this.$el.find(".nav-tabs").append(navTab); + return this.$el.find(".tab-content").append(navPanel); }, renderGroupHTML(group) { const emojis = []; - if (group.name === 'favorites') { - group.icons = _.pluck(this.favoriteEmojis(), 'code'); + if (group.name === "favorites") { + group.icons = _.pluck(this.favoriteEmojis(), "code"); } for (let emojiName of Array.from(group.icons)) { const url = this.findEmojiUrlByName(emojiName); if (!url) { continue; } - emojis.push(``); + emojis.push( + `` + ); } - return this.panels[group.name] = emojis.join(''); + return (this.panels[group.name] = emojis.join("")); }, changePanel(e) { - const groupName = $(e.currentTarget).data('group'); + const groupName = $(e.currentTarget).data("group"); return $(`#emoji-group-${groupName}`).html(this.panels[groupName]); }, insertCode(e) { const target = $(e.currentTarget); - const code = target.data('code'); + const code = target.data("code"); this.saveFavoritEmoji(code); window._editor.insertString(`:${code}: `); return false; @@ -103,43 +112,47 @@ window.EmojiModalView = Backbone.View.extend({ preview(e) { const target = $(e.currentTarget); - const emojiName = target.data('code'); - const code = `:${target.data('code')}: `; - const html = ` ${code}`; - return this.$el.find('.modal-footer').html(html); + const emojiName = target.data("code"); + const code = `:${target.data("code")}: `; + const html = ` ${code}`; + return this.$el.find(".modal-footer").html(html); }, show() { - if ($('.emoji-modal').length === 0) { - $('body').append(this.$el); + if ($(".emoji-modal").length === 0) { + $("body").append(this.$el); } - return this.$el.modal('show'); + return this.$el.modal("show"); }, hide() { - return this.$el.modal('hide'); + return this.$el.modal("hide"); }, saveFavoritEmoji(code) { let emojis = this.favoriteEmojis(); - let emoji = _.find(emojis, item => item.code === code); + let emoji = _.find(emojis, (item) => item.code === code); if (!emoji) { emoji = { code, hits: 0 }; emojis.push(emoji); } emoji.hits += 1; - emojis = _.sortBy(emojis, item => 0 - item.hits); + emojis = _.sortBy(emojis, (item) => 0 - item.hits); emojis = _.first(emojis, 100); - localStorage.setItem('favorite-emojis', JSON.stringify(emojis)); + localStorage.setItem("favorite-emojis", JSON.stringify(emojis)); return this.renderGroupHTML(EMOJI_GROUPS[0]); }, favoriteEmojis() { - if (!window.localStorage) { return []; } + if (!window.localStorage) { + return []; + } try { - return JSON.parse(localStorage.getItem('favorite-emojis') || '[]'); + return JSON.parse(localStorage.getItem("favorite-emojis") || "[]"); } catch (error) { return []; } - } + }, }); diff --git a/app/javascript/front/index.scss b/app/javascript/front/index.scss index d09a94a49b..25f12ca121 100644 --- a/app/javascript/front/index.scss +++ b/app/javascript/front/index.scss @@ -27,6 +27,7 @@ } hr { + background: var(--divider-color); border-top: 1px solid var(--divider-color); } @@ -745,14 +746,6 @@ hr { } } -.edit-reply { - form { - .btn-primary { - margin-right: 10px; - } - } -} - #node-selector { .card { border: 0; diff --git a/app/javascript/front/notifier.js b/app/javascript/front/notifier.js index 81b1f8e6b8..8ad92e1a34 100644 --- a/app/javascript/front/notifier.js +++ b/app/javascript/front/notifier.js @@ -7,19 +7,19 @@ class Notifier { } hasSupport() { - return (window.webkitNotifications != null); + return window.webkitNotifications != null; } requestPermission(cb) { - return window.webkitNotifications.requestPermission((cb)); + return window.webkitNotifications.requestPermission(cb); } setPermission() { if (this.hasPermission()) { - $('#notification-alert a.close').click(); - return this.enableNotification = true; + $("#notification-alert a.close").click(); + return (this.enableNotification = true); } else if (window.webkitNotifications.checkPermission() === 2) { - return $('#notification-alert a.close').click(); + return $("#notification-alert a.close").click(); } } @@ -34,35 +34,47 @@ class Notifier { checkOrRequirePermission() { if (this.hasSupport()) { if (this.hasPermission()) { - return this.enableNotification = true; + return (this.enableNotification = true); } else { if (window.webkitNotifications.checkPermission() !== 2) { return this.showTooltip(); } } } else { - return console.log("Desktop notifications are not supported for this Browser/OS version yet."); + return console.log( + "Desktop notifications are not supported for this Browser/OS version yet." + ); } } showTooltip() { - $('.breadcrumb').before("
    点击这里 开启桌面提醒通知功能。 ×
    "); + $(".breadcrumb").before( + "
    点击这里 开启桌面提醒通知功能。 ×
    " + ); $("#notification-alert").alert(); - return $('#notification-alert').on('click', 'a#link_enable_notifications', e => { - e.preventDefault(); - return this.requestPermission(this.setPermission); - }); + return $("#notification-alert").on( + "click", + "a#link_enable_notifications", + (e) => { + e.preventDefault(); + return this.requestPermission(this.setPermission); + } + ); } visitUrl(url) { - return window.location.href = url; + return (window.location.href = url); } notify(avatar, title, content, url = null) { if (this.enableNotification) { let popup; if (!window.Notification) { - popup = window.webkitNotifications.createNotification(avatar, title, content); + popup = window.webkitNotifications.createNotification( + avatar, + title, + content + ); if (url) { popup.onclick = function () { window.parent.focus(); @@ -75,7 +87,7 @@ class Notifier { onclick() { window.parent.focus(); return $.notifier.visitUrl(url); - } + }, }; popup = new window.Notification(title, opts); } @@ -85,4 +97,4 @@ class Notifier { } // setTimeout ( => popup.cancel() ), 12000 -$.notifier = new Notifier; +$.notifier = new Notifier(); diff --git a/app/javascript/front/toc.js b/app/javascript/front/toc.js index c9e2e39b42..93d543b273 100644 --- a/app/javascript/front/toc.js +++ b/app/javascript/front/toc.js @@ -17,10 +17,10 @@ window.TOCView = Backbone.View.extend({ const markdownEl = $(".markdown-toc"); markdownEl.prepend(`\
    - -
    +
    \ `); diff --git a/app/javascript/front/users.scss b/app/javascript/front/users.scss index 64c151badb..f97c277244 100644 --- a/app/javascript/front/users.scss +++ b/app/javascript/front/users.scss @@ -13,7 +13,7 @@ .nav-tabs > .active > a, .nav-tabs > .active > a:hover { - color: var(--btn-default-text-color); + color: var(--btn-secondary-text-color); background: var(--card-background-color); border: 1px solid var(--card-border-color); border-bottom-color: transparent; @@ -548,8 +548,8 @@ table.node-topics { } .button-follow-user.btn-primary.active { - background: var(--btn-default-active-background-color) !important; - border-color: var(--btn-default-active-border-color) !important; + background: var(--btn-secondary-active-background-color) !important; + border-color: var(--btn-secondary-active-border-color) !important; color: var(--text-color1) !important; } diff --git a/app/javascript/homeland/_vars.scss b/app/javascript/homeland/_vars.scss index 3887429913..a19bea9e83 100644 --- a/app/javascript/homeland/_vars.scss +++ b/app/javascript/homeland/_vars.scss @@ -1,7 +1,7 @@ $red: #eb5424; $blue: #225eda; $green: #19a302; -$yellow: #fee209; +$yellow: #dbc12d; :root { --primary: #404040 !important; @@ -15,7 +15,7 @@ $yellow: #fee209; --gray: #f2f2f2; --red: #eb5424; --red-light: #fdf1ed; - --yellow: #fee209; + --yellow: #dbc12d; --yellow-light: #fffdee; --blue: #225eda; --blue-light: #e6f0fb; @@ -30,14 +30,14 @@ $yellow: #fee209; // speical vars --btn-border-radius: 0.375rem; --btn-box-shaodw: 0 1px 2px 0 rgba(0, 0, 0, 0.05); - --btn-default-text-color: rgba(55, 65, 81, 1); - --btn-default-background-color: #fff; - --btn-default-border-color: rgba(209, 213, 219, 1); - --btn-default-active-background-color: #fff; - --btn-default-active-border-color: rgba(209, 213, 219, 1); - --btn-default-active-text-color: rgba(55, 65, 81, 1); - --btn-default-hover-background-color: rgba(249, 250, 251, 1); - --btn-default-hover-border-color: rgba(209, 213, 219, 1); + --btn-secondary-text-color: rgba(55, 65, 81, 1); + --btn-secondary-background-color: #fff; + --btn-secondary-border-color: rgba(209, 213, 219, 1); + --btn-secondary-active-background-color: #fff; + --btn-secondary-active-border-color: rgba(209, 213, 219, 1); + --btn-secondary-active-text-color: rgba(55, 65, 81, 1); + --btn-secondary-hover-background-color: rgba(249, 250, 251, 1); + --btn-secondary-hover-border-color: rgba(209, 213, 219, 1); --form-control-background-color: #fff; --form-control-border-color: rgba(209, 213, 219, 1); @@ -108,7 +108,6 @@ $yellow: #fee209; --nav-pills-active-text-color: #fff; } -$spacer: 15px; $font-size-base: 0.875rem; $font-family-sans-serif: Helvetica, Arial, "PingFang SC", "Noto Sans", Roboto, "Microsoft Yahei", sans-serif; diff --git a/app/javascript/homeland/dark-mode.scss b/app/javascript/homeland/dark-mode.scss index c6430137c3..135c6053ce 100644 --- a/app/javascript/homeland/dark-mode.scss +++ b/app/javascript/homeland/dark-mode.scss @@ -23,14 +23,14 @@ --filter-color: #6f6f6f; --filter-active-color: #bb0b0b0; - --btn-default-text-color: #c7c7c7; - --btn-default-background-color: #3d3d3d99; - --btn-default-border-color: #414144; - --btn-default-active-background-color: #27272b99; - --btn-default-active-border-color: #414144; - --btn-default-active-text-color: #eeeeeebd; - --btn-default-hover-background-color: #4d4d4d99; - --btn-default-hover-border-color: #59595e; + --btn-secondary-text-color: #c7c7c7; + --btn-secondary-background-color: #3d3d3d99; + --btn-secondary-border-color: #414144; + --btn-secondary-active-background-color: #27272b99; + --btn-secondary-active-border-color: #414144; + --btn-secondary-active-text-color: #eeeeeebd; + --btn-secondary-hover-background-color: #4d4d4d99; + --btn-secondary-hover-border-color: #59595e; --form-control-background-color: #0104094d; --form-control-border-color: #21262d; diff --git a/app/javascript/homeland/index.js b/app/javascript/homeland/index.js index cfcd8b368f..f119e3eec7 100644 --- a/app/javascript/homeland/index.js +++ b/app/javascript/homeland/index.js @@ -1,9 +1,9 @@ -import "bootstrap"; import jQuery from "jquery"; window.jQuery = jQuery; window.$ = jQuery; window.Backbone = require("backbone"); window._ = require("underscore"); +window.bootstrap = require("bootstrap"); import Turbolinks from "turbolinks"; import TubrolinksPrefetch from "turbolinks-prefetch"; @@ -63,7 +63,7 @@ window.App = { // 警告信息显示, to 显示在那个 DOM 前 (可以用 css selector) alert(msg, to) { $(".alert").remove(); - const html = `
    ${msg}
    `; + const html = `
    ${msg}
    `; if (to) { return $(to).before(html); } else { @@ -74,7 +74,7 @@ window.App = { // 成功信息显示, to 显示在那个 DOM 前 (可以用 css selector) notice(msg, to) { $(".alert").remove(); - const html = `
    ${msg}
    `; + const html = `
    ${msg}
    `; if (to) { return $(to).before(html); } else { @@ -164,7 +164,7 @@ window.App = { }, }, displayTpl: - "
  • ${login} ${name}
    • ", + "
  • ${login} ${name}
    • ", insertTpl: "@${login}", }) .atwho({ @@ -172,7 +172,7 @@ window.App = { limit: 8, searchKey: "code", data: window.EMOJI_LIST, - displayTpl: `
  • \${code}
    • `, + displayTpl: `
  • \${code}
    • `, insertTpl: "${code}", }); return true; @@ -180,7 +180,10 @@ window.App = { }; document.addEventListener("turbolinks:load", () => { - $("select.bootstrap-select").selectpicker({ size: 10, style: "btn-default" }); + $("select.bootstrap-select").selectpicker({ + size: 10, + style: "btn-secondary", + }); }); document.addEventListener("turbolinks:before-cache", () => { $("select.bootstrap-select") diff --git a/app/javascript/homeland/index.scss b/app/javascript/homeland/index.scss index e72cd1058f..266ed545e8 100644 --- a/app/javascript/homeland/index.scss +++ b/app/javascript/homeland/index.scss @@ -1,6 +1,29 @@ @import "_mixins"; @import "_vars"; +@import "~bootstrap/scss/functions"; +@import "~bootstrap/scss/variables"; +@import "~bootstrap/scss/utilities"; +$utilities: map-merge( + $utilities, + ( + "margin-start": + map-merge( + map-get($utilities, "margin-start"), + ( + class: ml, + ) + ), + "margin-end": + map-merge( + map-get($utilities, "margin-end"), + ( + class: mr, + ) + ), + ) +); + @import "~bootstrap/scss/bootstrap"; @import "./iconfont.scss"; @import "./markdown.scss"; @@ -21,6 +44,10 @@ } } +a { + text-decoration: none; +} + .flex { display: flex; } @@ -34,11 +61,11 @@ } .jcc { - justify-content: center !important; + @extend .justify-content-md-center; } .jcsb { - justify-content: space-between !important; + @extend .justify-content-md-between; } .jcsa { @@ -60,7 +87,7 @@ input[type="file"]::-webkit-file-upload-button { color: var(--primary); - background: var(--btn-default-background-color); + background: var(--btn-secondary-background-color); -webkit-appearance: none !important; border: 0; outline: none; @@ -122,6 +149,14 @@ textarea, border-radius: 3px; } +.media { + @extend .d-flex; + + .media-body { + @extend .flex-grow-1; + } +} + /* Bootstrap Theme */ body { background: var(--body-background-color); @@ -360,20 +395,20 @@ body { } } -.btn-default { - border-color: var(--btn-default-border-color); - background: var(--btn-default-background-color); - color: var(--btn-default-text-color) !important; +.btn-secondary { + border-color: var(--btn-secondary-border-color); + background: var(--btn-secondary-background-color); + color: var(--btn-secondary-text-color) !important; &:hover { - background: var(--btn-default-hover-background-color); - border-color: var(--btn-default-hover-border-color); + background: var(--btn-secondary-hover-background-color); + border-color: var(--btn-secondary-hover-border-color); } &:active, &.active { - color: var(--btn-default-active-text-color); - border-color: var(--btn-default-active-border-color); - background: var(--btn-default-active-background-color); + color: var(--btn-secondary-active-text-color); + border-color: var(--btn-secondary-active-border-color); + background: var(--btn-secondary-active-background-color); } } @@ -388,6 +423,51 @@ body { } } +.btn-success { + background: var(--green); + border-color: var(--green); + color: #fff !important; + + &:hover { + background: var(--green); + border-color: var(--green); + } +} + +.btn-danger { + background: var(--red); + border-color: var(--red); + color: #fff !important; + + &:hover { + background: var(--red); + border-color: var(--red); + } +} + +.btn-block { + display: block; + width: 100%; +} + +.form-group { + @extend .mb-3; +} + +.form-actions { + @extend .d-grid; + @extend .gap-2; + @extend .d-block; + @extend .d-md-flex; + + .btn { + min-width: 100px; + } + .btn-primary { + min-width: 150px; + } +} + .form-error { margin-top: 5px; color: #ee4343; @@ -530,7 +610,7 @@ input[type="file"] { } .page-link { - @extend .btn-default; + @extend .btn-secondary; } li > a, @@ -795,7 +875,7 @@ kbd { text-decoration: none; } - .dropdown.show a[data-toggle="dropdown"], + .dropdown.show a[data-bs-toggle="dropdown"], a:hover:not(.dropdown-item) { transition-property: background-color; transition-duration: 0.5s; @@ -930,7 +1010,7 @@ img.emoji { .toolbar-buttons { a.nav-link { - @extend .btn-default; + @extend .btn-secondary; font-size: 14px; line-height: 14px; @@ -988,12 +1068,6 @@ img.emoji { margin-top: 1px; } - .opts { - a { - padding: 5px !important; - margin: 0 !important; - } - } .row { margin: 0; .col-lg-9, diff --git a/app/views/admin/applications/index.html.erb b/app/views/admin/applications/index.html.erb index cd9722ce92..8a95e896cb 100644 --- a/app/views/admin/applications/index.html.erb +++ b/app/views/admin/applications/index.html.erb @@ -1,19 +1,13 @@ <% content_for :sitemap do %> OAuth Applications <% end %> -
    -
    - -
    -
    - <%= select_tag(:level, options_for_select([['All Level',''], ['Level 0', 0], ['Level 1', 1], ['Level 2', 2], ['Level 3', 3]], params[:level]), class: 'form-control') %> -
    - + + <%= select_tag(:level, options_for_select([['All Level',''], ['Level 0', 0], ['Level 1', 1], ['Level 2', 2], ['Level 3', 3]], params[:level]), class: 'form-control') %> +
    -
    @@ -27,20 +21,19 @@ <% @applications.each do |item| %> - "> - - - - - - - - - + "> + + + + + + + + + <% end %>
    <%= item.id %><%= link_to item.name, admin_application_path(item.id) %><%= item.uid %><%= user_name_tag(item.owner) %><%= item.access_tokens.count %><%= item.level %><%= l(item.created_at, format: :long) %> - <%= link_to icon_tag("pencil"), edit_admin_application_path(item) %> -
    <%= item.id %><%= link_to item.name, admin_application_path(item.id) %><%= item.uid %><%= user_name_tag(item.owner) %><%= item.access_tokens.count %><%= item.level %><%= l(item.created_at, format: :long) %> + <%= link_to icon_tag("pencil"), edit_admin_application_path(item) %> +
    - <%= paginate @applications %>
    diff --git a/app/views/admin/applications/show.html.erb b/app/views/admin/applications/show.html.erb index cab1b05fd4..b0192b3d4a 100644 --- a/app/views/admin/applications/show.html.erb +++ b/app/views/admin/applications/show.html.erb @@ -1,7 +1,6 @@ <% content_for :sitemap do %> OAuth Applications Detail <% end %> -
    • <%= @application.name %>
      • @@ -16,8 +15,7 @@
    • <%= @application.level %>
    -
    <%= link_to t("common.edit"), edit_admin_application_path(@application), class: "btn btn-sm btn-success" %> - <%= link_to t("common.back"), admin_applications_path, class: "btn btn-sm btn-default" %> + <%= link_to t("common.back"), admin_applications_path, class: "btn btn-sm btn-secondary" %>
    diff --git a/app/views/admin/comments/index.html.erb b/app/views/admin/comments/index.html.erb index d00f5571ec..3e17e0b756 100644 --- a/app/views/admin/comments/index.html.erb +++ b/app/views/admin/comments/index.html.erb @@ -1,7 +1,6 @@ <% content_for :sitemap do %> <%= t('admin.menu.comments') %> <% end %> - - -<% @comments.each do |item| %> - - - - - - - -<% end %> + <% @comments.each do |item| %> + + + + + + + + <% end %>
    Target @@ -10,16 +9,15 @@ Time
    <%= item.commentable_type %>#<%= item.commentable_id %><%= item.user.login if !item.user.blank? %><%= item.body %><%= l item.created_at, format: :short %><%= link_to '', edit_admin_comment_path(item), class: "fa fa-edit" %> - <%= link_to '', admin_comment_path(item), 'data-confirm' => 'Are you sure?', method: :delete, remote: true, class: "fa fa-trash" %>
    <%= item.commentable_type %>#<%= item.commentable_id %><%= item.user.login if !item.user.blank? %><%= item.body %><%= l item.created_at, format: :short %><%= link_to '', edit_admin_comment_path(item), class: "fa fa-edit" %> + <%= link_to '', admin_comment_path(item), 'data-confirm' => 'Are you sure?', method: :delete, remote: true, class: "fa fa-trash" %>
    <%= paginate @comments %> diff --git a/app/views/admin/dashboards/index.html.erb b/app/views/admin/dashboards/index.html.erb index 90b474a0f2..3a886cd47a 100644 --- a/app/views/admin/dashboards/index.html.erb +++ b/app/views/admin/dashboards/index.html.erb @@ -3,12 +3,12 @@ <% end %>
    - <%= t("admin.site_configs.settings") %> - <%= t("admin.menu.plugins") %> - <%= t("admin.menu.applications") %> - <%= t("admin.menu.background_jobs") %> - <%= t("admin.menu.database") %> - <%= t("admin.menu.exception_logs") %>... + <%= t("admin.site_configs.settings") %> + <%= t("admin.menu.plugins") %> + <%= t("admin.menu.applications") %> + <%= t("admin.menu.background_jobs") %> + <%= t("admin.menu.database") %> + <%= t("admin.menu.exception_logs") %>...
    @@ -16,15 +16,15 @@ <%= link_to icon_tag("power-off", label: t("admin.reboot")), reboot_admin_dashboards_path, data: { method: :post, confirm: "你确定要重启 Homeland 吗？", disable_with: "请求中..." }, class: "text-danger pull-right" %>
    <% if Setting.legecy_envs.any? %> -
    -

    Deprecated configuration detected

    -
      - <% Setting.legecy_envs.each do |key| %> -
    • Deprecated <%= key %> use <%= Setting.legecy_env_instead(key) %> instead.
      • - <% end %> -
    -
    More about the configuration: Homeland Document
    -
    +
    +

    Deprecated configuration detected

    +
      + <% Setting.legecy_envs.each do |key| %> +
    • Deprecated <%= key %> use <%= Setting.legecy_env_instead(key) %> instead.
      • + <% end %> +
    +
    More about the configuration: Homeland Document
    +
    <% end %>
    @@ -98,7 +98,7 @@ el.find(".total-week").text('+' + data.week_count); el.find(".total-month").text('+' + data.month_count); } - + var models = ['user', 'topic', 'reply', 'notification', 'photo', 'comment']; for (var i = 0; i < models.length; i ++) { var model = models[i]; diff --git a/app/views/admin/locations/index.html.erb b/app/views/admin/locations/index.html.erb index 348b9f076f..4aaa9e0a25 100644 --- a/app/views/admin/locations/index.html.erb +++ b/app/views/admin/locations/index.html.erb @@ -1,5 +1,4 @@ <%= render 'base' %> -
    @@ -9,14 +8,14 @@ <% @locations.each do |item| %> - "> - - - - - + "> + + + + + <% end %>
    <%= item.id %><%= item.name %><%= item.users_count %> - <%= link_to "", edit_admin_location_path(item.id), class: "fa fa-edit" %> -
    <%= item.id %><%= item.name %><%= item.users_count %> + <%= link_to "", edit_admin_location_path(item.id), class: "fa fa-edit" %> +
    <%= paginate @locations %> diff --git a/app/views/admin/nodes/_form.html.erb b/app/views/admin/nodes/_form.html.erb index 7dbb2aa0f2..aa937380f7 100644 --- a/app/views/admin/nodes/_form.html.erb +++ b/app/views/admin/nodes/_form.html.erb @@ -1,23 +1,19 @@ <%= form_for [:admin,@node] do |f| %> <%= render 'shared/error_messages', target: @node %> -
    <%= f.label :name %> <%= f.text_field :name, class: "form-control" %>
    -
    <%= f.label :sort %> <%= f.text_field :sort, class: "form-control" %>
    -
    <%= f.label :summary %> <%= f.text_area :summary, class: "form-control" %>
    -
    <%= f.submit t("common.save"), class: "btn btn-primary", 'data-disable-with' => t("common.saving") %> - <%= link_to 'Back', admin_nodes_path %> + <%= link_to t("common.cancel"), admin_nodes_path, class: "btn btn-secondary" %>
    <% end %> diff --git a/app/views/admin/nodes/index.html.erb b/app/views/admin/nodes/index.html.erb index f8f9489424..1caf4e75ea 100644 --- a/app/views/admin/nodes/index.html.erb +++ b/app/views/admin/nodes/index.html.erb @@ -1,11 +1,9 @@ <% content_for :sitemap do %> <%= t("admin.menu.nodes")%> <% end %> -
    - <%= link_to t("admin.nodes.new"), new_admin_node_path, class: "btn btn-default" %> + <%= link_to t("admin.nodes.new"), new_admin_node_path, class: "btn btn-secondary" %>
    - @@ -14,15 +12,14 @@ - -<% @nodes.each do |node| %> - - - - - - - -<% end %> + <% @nodes.each do |node| %> + + + + + + + + <% end %>
    #Topics Count
    <%= node.id %><%= link_to node.name, node_topics_path(node.id) %><%= node.sort %><%= node.topics_count %><%= link_to '', edit_admin_node_path(node), class: "fa fa-edit" %> - <%= link_to '', admin_node_path(node), 'data-confirm' => 'Are you sure?' , method: :delete, class: "fa fa-trash" %>
    <%= node.id %><%= link_to node.name, node_topics_path(node.id) %><%= node.sort %><%= node.topics_count %><%= link_to '', edit_admin_node_path(node), class: "fa fa-edit" %> + <%= link_to '', admin_node_path(node), 'data-confirm' => 'Are you sure?' , method: :delete, class: "fa fa-trash" %>
    diff --git a/app/views/admin/photos/index.html.erb b/app/views/admin/photos/index.html.erb index 65d9afe0e4..0e598e8c8f 100644 --- a/app/views/admin/photos/index.html.erb +++ b/app/views/admin/photos/index.html.erb @@ -1,27 +1,28 @@ <% content_for :sitemap do %> - <%= t('admin.menu.photos') %> + + <%= t('admin.menu.photos') %> + <% end %> -
    -
    - -
    - + +
    -
    <% @photos.each do |photo| %>
    -
    <%= link_to image_tag(photo.image.url(:md)), photo.image.url, target: "_blank" if !photo[:image].blank? %>
    +
    + <%= link_to image_tag(photo.image.url(:md)), photo.image.url, target: "_blank" if !photo[:image].blank? %> +
    <% if photo.user %> <%= link_to photo.user&.login, edit_admin_user_path(photo.user_id), target: "_blank" %> <% end %>
    - <%= link_to icon_tag("trash", label: "Delete"), admin_photo_path(photo), 'data-confirm' => 'Are you sure?', method: :delete, remote: true, class: "btn btn-default btn-sm btn-block" %> + <%= link_to icon_tag("trash", label: "Delete" ), admin_photo_path(photo), 'data-confirm'=> 'Are you sure?', + method: :delete, remote: true, class: "btn btn-secondary btn-sm btn-block" %>
    <% end %> diff --git a/app/views/admin/plugins/index.html.erb b/app/views/admin/plugins/index.html.erb index 06d0380807..68308d6337 100644 --- a/app/views/admin/plugins/index.html.erb +++ b/app/views/admin/plugins/index.html.erb @@ -3,8 +3,8 @@
    <%= link_to "Install...", new_admin_plugin_path, class: "btn btn-primary" %> - <%= link_to "Find plugins", "https://github.com/topics/homeland-plugin", class: "btn btn-default", target: "_blank" %> - <%= link_to "Navbar order...", edit_admin_site_config_path("sorted_plugins"), class: "btn btn-default pull-right" %> + <%= link_to "Find plugins", "https://github.com/topics/homeland-plugin", class: "btn btn-secondary", target: "_blank" %> + <%= link_to "Navbar order...", edit_admin_site_config_path("sorted_plugins"), class: "btn btn-secondary pull-right" %>
      <% Homeland.plugins.each do |plugin| %> @@ -15,7 +15,7 @@ <%= plugin.version %>
    <% if plugin.uninstallable? %> - <%= link_to "Uninstall", admin_plugin_path(plugin.name), data: { method: :delete, confirm: "Are you sure to uninstall this Plugin?", confirm_with: "Uninstalling..." }, class: "btn btn-default btn-sm pull-right" %> + <%= link_to "Uninstall", admin_plugin_path(plugin.name), data: { method: :delete, confirm: "Are you sure to uninstall this Plugin?", confirm_with: "Uninstalling..." }, class: "btn btn-secondary btn-sm pull-right" %> <% end %> <% end %> diff --git a/app/views/admin/plugins/new.html.erb b/app/views/admin/plugins/new.html.erb index 8cb16c393c..58a55aa40e 100644 --- a/app/views/admin/plugins/new.html.erb +++ b/app/views/admin/plugins/new.html.erb @@ -1,8 +1,8 @@
    Install Plugin
    <%= form_for User.new, url: admin_plugins_path, method: :post, html: { enctype: "multipart/form-data" } do |f| %>
    - - + +
    Please select the Homeland plugin zip package and install it. Do not install non-Homeland plugins, otherwise it will cause unexpected problems!
    diff --git a/app/views/admin/plugins/show.html.erb b/app/views/admin/plugins/show.html.erb index 35456071dc..f5a928087a 100644 --- a/app/views/admin/plugins/show.html.erb +++ b/app/views/admin/plugins/show.html.erb @@ -2,7 +2,7 @@
    <%= icon_tag("plug") %> <%= @plugin.display_name %>
    <%= @plugin.version %>
    - <%= link_to t("common.back"), admin_plugins_path, class: "btn btn-default btn-sm" %> + <%= link_to t("common.back"), admin_plugins_path, class: "btn btn-secondary btn-sm" %>
    diff --git a/app/views/admin/replies/edit.html.erb b/app/views/admin/replies/edit.html.erb index ef879bec35..649b92175d 100644 --- a/app/views/admin/replies/edit.html.erb +++ b/app/views/admin/replies/edit.html.erb @@ -3,10 +3,8 @@ <% end %>

    <%= t("common.edit") %><%= t('admin.menu.replies') %>

    -
    - <%= link_to '返回', admin_replies_path, class: "btn btn-default btn-sm" %> + <%= link_to '返回', admin_replies_path, class: "btn btn-secondary btn-sm" %>
    - -<%= render 'form' %> \ No newline at end of file +<%= render 'form' %> diff --git a/app/views/admin/replies/index.html.erb b/app/views/admin/replies/index.html.erb index cc8dcd3941..1694f689c4 100644 --- a/app/views/admin/replies/index.html.erb +++ b/app/views/admin/replies/index.html.erb @@ -1,20 +1,13 @@ <% content_for :sitemap do %> <%= t('admin.menu.replies') %> <% end %> -
    -
    - -
    -
    - -
    - + + +
    - - @@ -24,28 +17,26 @@ - -<% @replies.each do |reply| %> - - - - <% if reply.topic %> - + + + <% if reply.topic %> + + <% else %> - + <% end %> - - - - <% else %> - <%= link_to "", revert_admin_reply_path(reply), title: t("common.revert"), 'data-confirm' => 'Are you sure?', method: :post, class: "fa fa-undo" %> - <% end %> - -<% end %> + + + + <% else %> + <%= link_to "", revert_admin_reply_path(reply), title: t("common.revert"), 'data-confirm' => 'Are you sure?', method: :post, class: "fa fa-undo" %> + <% end %> + + <% end %>
    #Time
    <%= reply.id %><%= truncate(reply.body, length: 50) %> + <% @replies.each do |reply| %> +
    <%= reply.id %><%= truncate(reply.body, length: 50) %> <%= link_to(reply.topic_id, topic_path(reply.topic_id), title: reply.topic.title)%> - <%= reply.topic_id %><%= reply.topic_id %><%= link_to(reply.user.login, edit_admin_user_path(reply.user_id), target: "_blank") if reply.user %><%= l reply.created_at, format: :short %><%= link_to '', edit_admin_reply_path(reply), class: "fa fa-edit" %> - <% if reply.deleted_at.blank? %> - <%= link_to '', admin_reply_path(reply), 'data-confirm' => 'Are you sure?', method: :delete, remote: true, class: "fa fa-trash" %>
    <%= link_to(reply.user.login, edit_admin_user_path(reply.user_id), target: "_blank") if reply.user %><%= l reply.created_at, format: :short %><%= link_to '', edit_admin_reply_path(reply), class: "fa fa-edit" %> + <% if reply.deleted_at.blank? %> + <%= link_to '', admin_reply_path(reply), 'data-confirm' => 'Are you sure?', method: :delete, remote: true, class: "fa fa-trash" %>
    <%= paginate @replies %> - diff --git a/app/views/admin/site_configs/_form.html.erb b/app/views/admin/site_configs/_form.html.erb index e8fe7bd6f7..570134ca7f 100644 --- a/app/views/admin/site_configs/_form.html.erb +++ b/app/views/admin/site_configs/_form.html.erb @@ -1,7 +1,7 @@ <%= form_for @site_config, url: admin_site_config_path(@site_config.var), method: 'patch' do |f| %> <%= render "/shared/error_messages", target: @site_config %>
    -
    -
    +
    <%= f.submit t("common.save"), class: "btn btn-primary", 'data-disable-with' => t("common.saving") %> - <%= t("common.cancel") %> + <%= t("common.cancel") %>
    <% end %> diff --git a/app/views/admin/topics/_form.html.erb b/app/views/admin/topics/_form.html.erb index 54984dc659..c89c76d0eb 100644 --- a/app/views/admin/topics/_form.html.erb +++ b/app/views/admin/topics/_form.html.erb @@ -1,24 +1,20 @@ <%= form_for [:admin,@topic] do |f| %> <%= render 'shared/error_messages', target: @topic %> -
    <%= f.label :title %>
    <%= f.select :node_id, Node.name_options, {}, class: "bootstrap-select mr-1" %> <%= f.text_field :title, class: "form-control" %> - <%= link_to icon_tag("link"), @topic, target: "_blank", class: "btn btn-default ml-2" %> + <%= link_to icon_tag("link"), @topic, target: "_blank", class: "btn btn-secondary ml-2" %>
    -
    <%= f.label :body %> <%= f.text_area :body, class: "form-control", rows: 20 %>
    -
    Created by <%= user_name_tag @topic.user %>
    -
    <%= f.submit t("common.save"), class: "btn btn-primary", 'data-disable-with' => t("common.saving") %>
    diff --git a/app/views/admin/topics/edit.html.erb b/app/views/admin/topics/edit.html.erb index facb06f13f..6619928075 100644 --- a/app/views/admin/topics/edit.html.erb +++ b/app/views/admin/topics/edit.html.erb @@ -1,12 +1,8 @@ <% content_for :sitemap do %> <%= t("admin.menu.topics")%> <%= t("common.edit")%> <% end %> -

    <%= t("common.edit")%><%= t("admin.menu.topics") %>

    - <%= link_to '返回', admin_topics_path, class: "btn btn-default btn-sm ml-2" %> + <%= link_to '返回', admin_topics_path, class: "btn btn-secondary btn-sm ml-2" %>
    - <%= render 'form' %> - - diff --git a/app/views/admin/topics/index.html.erb b/app/views/admin/topics/index.html.erb index fb01bbaa80..81ce15e71a 100644 --- a/app/views/admin/topics/index.html.erb +++ b/app/views/admin/topics/index.html.erb @@ -3,13 +3,9 @@ <% end %>
    -
    - -
    -
    - -
    - + + +
    @@ -24,35 +20,35 @@ <% @topics.each do |topic| %> - - - - - - + + + + + + + <% end %> - - - -<% end %>
    <%= topic.id %> - <%= link_to truncate(topic.title, length: 30), topic, target: "_blank" %> - <%= topic.node&.name %><%= user_name_tag(topic.user) %><%= topic.replies_count %> - <% if topic.deleted_at.blank? %> - <%= l topic.created_at, format: :short %> - <% else %> - <%= link_to topic.who_deleted, user_path(topic.who_deleted) if not topic.who_deleted.blank? %> Deleted at
    - <%= l topic.deleted_at, format: :short %> +     		<%= topic.id %> + <%= link_to truncate(topic.title, length: 30), topic, target: "_blank" %> + <%= topic.node&.name %><%= user_name_tag(topic.user) %><%= topic.replies_count %> + <% if topic.deleted_at.blank? %> + <%= l topic.created_at, format: :short %> + <% else %> + <%= link_to topic.who_deleted, user_path(topic.who_deleted) if not topic.who_deleted.blank? %> Deleted at
    + <%= l topic.deleted_at, format: :short %> + <% end %> +     		+ <% if !topic.suggested_at.blank? %> + <%= link_to t("common.un_top"), unsuggest_admin_topic_path(topic), 'data-confirm' => 'Are you sure?', method: :post %> + <% else %> + <%= link_to t("common.place_top"), suggest_admin_topic_path(topic), 'data-confirm' => 'Are you sure?', method: :post %> + <% end %> + <%= link_to "", edit_admin_topic_path(topic), class: "fa fa-edit" %> + <% if topic.deleted_at.blank? %> + <%= link_to "", admin_topic_path(topic), 'data-confirm' => 'Are you sure?', method: :delete, class: "fa fa-trash" %> + <% else %> + <%= link_to "", revert_admin_topic_path(topic), title: t("common.revert"), 'data-confirm' => 'Are you sure?', method: :post, class: "fa fa-undo" %> + <% end %> +
    - <% if !topic.suggested_at.blank? %> - <%= link_to t("common.un_top"), unsuggest_admin_topic_path(topic), 'data-confirm' => 'Are you sure?', method: :post %> - <% else %> - <%= link_to t("common.place_top"), suggest_admin_topic_path(topic), 'data-confirm' => 'Are you sure?', method: :post %> - <% end %> - <%= link_to "", edit_admin_topic_path(topic), class: "fa fa-edit" %> - <% if topic.deleted_at.blank? %> - <%= link_to "", admin_topic_path(topic), 'data-confirm' => 'Are you sure?', method: :delete, class: "fa fa-trash" %> - <% else %> - <%= link_to "", revert_admin_topic_path(topic), title: t("common.revert"), 'data-confirm' => 'Are you sure?', method: :post, class: "fa fa-undo" %> - <% end %> -
    <%= paginate @topics %> diff --git a/app/views/admin/users/_form.html.erb b/app/views/admin/users/_form.html.erb index aa7bc4ebf8..15cc3f6f86 100644 --- a/app/views/admin/users/_form.html.erb +++ b/app/views/admin/users/_form.html.erb @@ -4,133 +4,107 @@ <%= f.label :login %> <%= f.text_field :login, class: "form-control" %>
    -
    <%= f.label :name %> <%= f.text_field :name, class: "form-control" %>
    -
    <%= f.label :email %> <%= f.email_field :email, class: "form-control" %>
    - <% if Setting.has_profile_field? :location %> -
    - <%= f.label :location %> - <%= f.text_field :location, class: "form-control" %> -
    +
    + <%= f.label :location %> + <%= f.text_field :location, class: "form-control" %> +
    <% end %> - <% if Setting.has_module? :github %> -
    - <%= f.label :github %> - <%= f.text_field :github, class: "form-control" %> -
    +
    + <%= f.label :github %> + <%= f.text_field :github, class: "form-control" %> +
    <% end %> - <% if Setting.has_profile_field? :twitter %> -
    - <%= f.label :twitter %> - <%= f.text_field :twitter, class: "form-control" %> -
    +
    + <%= f.label :twitter %> + <%= f.text_field :twitter, class: "form-control" %> +
    <% end %> -
    <%= f.check_box :email_public, class: "form-check-input" %> <%= f.label :email_public, class: "form-check-label" %>
    - <% if Setting.has_profile_field? :company %> -
    - <%= f.label :company %> - <%= f.text_field :company, class: "form-control" %> -
    +
    + <%= f.label :company %> + <%= f.text_field :company, class: "form-control" %> +
    <% end %> - <% if Setting.has_profile_field? :tagline %> -
    - <%= f.label :tagline %> - <%= f.text_field :tagline, class: "form-control" %> -
    +
    + <%= f.label :tagline %> + <%= f.text_field :tagline, class: "form-control" %> +
    <% end %> -
    <%= f.label :bio %> <%= f.text_area :bio, class: "form-control" %>
    - - <% if Setting.has_profile_field? :website %> -
    - <%= f.label :website %> - <%= f.text_field :website, class: "form-control" %> -
    +
    + <%= f.label :website %> + <%= f.text_field :website, class: "form-control" %> +
    <% end %> -
    <%= f.label :avatar %> <%= f.file_field :avatar, class: "form-control" %>
    -
    <%= user_avatar_tag(@user, :lg) %>
    - <% if @user.user_type == :user %>
    <%= f.label :state %> <%= f.select :state, User.state_options, {}, class: "form-control" %>
    -
    <%= f.label :sign_in_count %> <%= f.text_field :sign_in_count, class: "form-control", readonly: true %>
    -
    <%= f.label :last_sign_in_at %> <%= f.text_field :last_sign_in_at, class: "form-control", readonly: true %>
    -
    <%= f.label :current_sign_in_at %> <%= f.text_field :current_sign_in_at, class: "form-control", readonly: true %>
    -
    <%= f.label :last_sign_in_ip %> <%= f.text_field :last_sign_in_ip, class: "form-control", readonly: true %>
    -
    <%= f.label :current_sign_in_ip %> <%= f.text_field :current_sign_in_ip, class: "form-control", readonly: true %>
    - <% if @user.authorizations.any? %> -
    - - <% @user.authorizations.each do |auth| %> - - - - - <% end %> -
    <%= auth.provider %><%= auth.uid %>
    -
    +
    + + <% @user.authorizations.each do |auth| %> + + + + + <% end %> +
    <%= auth.provider %><%= auth.uid %>
    +
    <% end %> - <% end %> - -
    -
    - <%= f.submit t("common.save"), class: "btn btn-block btn-primary", 'data-disable-with' => t("common.saving") %> -
    -
    - <% if !@user.deleted? %> - <%= link_to 'Ban', admin_user_path(@user.id), method: :delete, data: { confirm: "Are you sure to ban this user?" }, class: "btn btn-danger" %> - <% end %> -
    +
    + <%= f.submit t("common.save"), class: "btn btn-block btn-primary", 'data-disable-with' => t("common.saving") %> + <% if !@user.deleted? %> + <%= link_to 'Ban', admin_user_path(@user.id), method: :delete, data: { confirm: "Are you sure to ban this user?" }, class: "btn btn-danger" %> + <% end %>
    <% end %> diff --git a/app/views/admin/users/_user.html.erb b/app/views/admin/users/_user.html.erb index a99a073508..0ef8bc2650 100644 --- a/app/views/admin/users/_user.html.erb +++ b/app/views/admin/users/_user.html.erb @@ -4,9 +4,8 @@
    - <%= link_to user.fullname, user_path(user), target: "_blank" %> + <%= link_to user.fullname, user_path(user), target: "_blank" %>
    -
    <%= user_level_tag(user) unless user.member? %>
    @@ -15,14 +14,14 @@
    <% if user.bio.present? %> -
    - <%= truncate user.bio, length: 300 %> -
    +
    + <%= truncate user.bio, length: 300 %> +
    <% end %> <% if user.tagline.present? %> -
    - <%= truncate user.tagline %> -
    +
    + <%= truncate user.tagline %> +
    <% end %>
    <% if user.topics_count > 0 %> @@ -35,10 +34,10 @@
    - <%= link_to icon_tag("edit"), edit_admin_user_path(user.id), class: "btn btn-default btn-sm" %> + <%= link_to icon_tag("edit"), edit_admin_user_path(user.id), class: "btn btn-secondary btn-sm" %> <% if !user.deleted? %> - <%= link_to icon_tag("ban"), admin_user_path(user.id), class: "btn btn-default btn-sm", method: :delete, remote: true, data: { confirm: "Are you sure to ban this user?" } %> + <%= link_to icon_tag("ban"), admin_user_path(user.id), class: "btn btn-secondary btn-sm", method: :delete, remote: true, data: { confirm: "Are you sure to ban this user?" } %> <% end %>
    - \ No newline at end of file + diff --git a/app/views/admin/users/edit.html.erb b/app/views/admin/users/edit.html.erb index c1cb7e8456..4635da35c2 100644 --- a/app/views/admin/users/edit.html.erb +++ b/app/views/admin/users/edit.html.erb @@ -1,23 +1,19 @@ <% content_for :sitemap do %> <%= t("admin.menu.users")%> <%= t("common.edit")%> <% end %> - <% if @user.user_type == :user %> -
    - - <%= link_to t('admin.users.Delete recent 10 photos'), clean_admin_user_path(@user, type: 'photos'), - method: 'delete', class: 'btn btn-warning', +
    +
    + <%= link_to t('admin.users.Delete recent 10 photos'), clean_admin_user_path(@user, type: 'photos'), + method: 'delete', class: 'btn btn-sm btn-outline-danger', data: { confirm: 'This action is not recoverable, are you sure?' } %> - - <%= link_to t('admin.users.Delete recent 10 topics'), clean_admin_user_path(@user, type: 'topics'), - method: 'delete', class: 'btn btn-warning', + <%= link_to t('admin.users.Delete recent 10 topics'), clean_admin_user_path(@user, type: 'topics'), + method: 'delete', class: 'btn btn-sm btn-outline-danger', data: { confirm: 'This action is not recoverable, are you sure?' } %> - - <%= link_to t('admin.users.Delete recent 10 replies'), clean_admin_user_path(@user, type: 'replies'), - method: 'delete', class: 'btn btn-warning', + <%= link_to t('admin.users.Delete recent 10 replies'), clean_admin_user_path(@user, type: 'replies'), + method: 'delete', class: 'btn btn-sm btn-outline-danger', data: { confirm: 'This action is not recoverable, are you sure?' } %> - -
    +
    +
    <% end %> - <%= render 'form' %> diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb index f60b987bee..6f8a051530 100644 --- a/app/views/admin/users/index.html.erb +++ b/app/views/admin/users/index.html.erb @@ -3,22 +3,13 @@ <% end %>
    -
    - <%= select_tag(:field, options_for_select([['Username','login'], ['Email','email'], ['Name','name']], params[:field]), class: 'form-control') %> -
    -
    - -
    -
    - <%= select_tag(:type, options_for_select([['All',''], ['Team','Team']], params[:type]), class: 'form-control') %> -
    -
    - <%= select_tag(:state, options_for_select(User.state_options, params[:state]), class: 'form-control', include_blank: "All state") %> -
    - + <%= select_tag(:field, options_for_select([['Username','login'], ['Email','email'], ['Name','name']], params[:field]), class: 'form-control') %> + + <%= select_tag(:type, options_for_select([['All',''], ['Team','Team']], params[:type]), class: 'form-control') %> + <%= select_tag(:state, options_for_select(User.state_options, params[:state]), class: 'form-control', include_blank: "All state") %> +
    - @@ -26,7 +17,6 @@ - <%= render collection: @users, partial: "user", as: :user %>
    #User Info
    <%= paginate @users %> diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 92176ab1a1..3d890590b8 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -49,7 +49,7 @@ end
    <%= f.check_box :email_public, checked: true, class: "custom-control-input" %> - +
    <%= form_group(f, :password) do %> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 3c4d938d90..ea9a34e329 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -26,7 +26,7 @@ auth_info = auth_session["info"]
    <%= f.check_box :remember_me, class: "custom-control-input" %> - +
    <% end -%> @@ -41,7 +41,7 @@ auth_info = auth_session["info"]
    <%= t("common.auth_with_other_services") %>
    <% Setting.omniauth_providers.each do |provider| %> - <%= link_to raw(" #{Homeland::Utils.omniauth_name(provider)}"), omniauth_authorize_path(:user, provider), method: :post, class: "btn btn-default omniauth-#{provider}" %> + <%= link_to raw(" #{Homeland::Utils.omniauth_name(provider)}"), omniauth_authorize_path(:user, provider), method: :post, class: "btn btn-secondary omniauth-#{provider}" %> <% end %>
    diff --git a/app/views/doorkeeper/applications/_form.html.erb b/app/views/doorkeeper/applications/_form.html.erb index bf2565f6e4..0c044266f2 100644 --- a/app/views/doorkeeper/applications/_form.html.erb +++ b/app/views/doorkeeper/applications/_form.html.erb @@ -5,15 +5,15 @@
    <%= form_for(application, url: doorkeeper_submit_path(application), html: { role: 'form'}) do |f| %> <% if application.errors.any? %> -

    <%= t('doorkeeper.applications.form.error') %>

    +
    +

    <%= t('doorkeeper.applications.form.error') %>

    +
    <% end %> - <%= content_tag :div, class: "form-group#{' has-error' if application.errors[:name].present?}" do %> <%= f.label :name %> <%= f.text_field :name, class: 'form-control' %> <%= doorkeeper_errors_for application, :name %> <% end %> - <%= content_tag :div, class: "form-group#{' has-error' if application.errors[:confidential].present?}" do %>
    diff --git a/app/views/doorkeeper/applications/index.html.erb b/app/views/doorkeeper/applications/index.html.erb index 287f5113cb..a0c3d75a54 100644 --- a/app/views/doorkeeper/applications/index.html.erb +++ b/app/views/doorkeeper/applications/index.html.erb @@ -56,7 +56,7 @@ <%= app.name %> <%= app.created_at.strftime(t('doorkeeper.authorized_applications.index.date_format')) %> - <%= link_to t("common.revoke"), oauth_authorized_application_path(app), class: "btn btn-default btn-sm", data: { confirm: "Are you sure?", method: :delete } %> + <%= link_to t("common.revoke"), oauth_authorized_application_path(app), class: "btn btn-secondary btn-sm", data: { confirm: "Are you sure?", method: :delete } %> <% end %> @@ -86,7 +86,7 @@ <%= device.platform_name %> <%= device.token %> <%= device.alive? %> - <%= link_to t("common.delete"), device, class: "btn btn-default btn-sm", data: { confirm: t("common.confirm_delete"), method: :delete } %> + <%= link_to t("common.delete"), device, class: "btn btn-secondary btn-sm", data: { confirm: t("common.confirm_delete"), method: :delete } %> <% end %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 067bcf6d64..d884aa1262 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -15,24 +15,24 @@ - - + + <%= content_for?(:title) ? yield(:title) : Setting.app_name %> - - + + <%= stylesheet_pack_tag "front", "data-turbolinks-track": "reload" %> <%= stylesheet_pack_tag "turbolinks-app", 'data-turbolinks-track': 'reload' if turbolinks_app? %> <%= yield :stylesheets %> <%= action_cable_meta_tag %> <%= csrf_meta_tag %> <%= raw Setting.custom_head_html %> - - + + <% if @content_description %> - + <% end %> <% if current_user %> @@ -46,7 +46,7 @@
    <%= raw Setting.navbar_brand_html %>
    -
    - <%= link_to t("notifications.show_invite"), main_app.user_team_user_path(team, team_user), class: 'btn btn-default btn-sm' %> + <%= link_to t("notifications.show_invite"), main_app.user_team_user_path(team, team_user), class: 'btn btn-secondary btn-sm' %>
    <% end %> diff --git a/app/views/notifications/notifications/index.html.erb b/app/views/notifications/notifications/index.html.erb index 24b06e7539..9045cdc695 100644 --- a/app/views/notifications/notifications/index.html.erb +++ b/app/views/notifications/notifications/index.html.erb @@ -6,7 +6,7 @@ <%= @notifications.total_count %>
    - <%= link_to icon_tag("trash", label: t('notifications.clean_all')), notifications.clean_notifications_path, class: "text-danger", id: 'btn-remove-all', method: 'delete', remote: true %> + <%= link_to icon_tag("trash", label: t('notifications.clean_all')), notifications.clean_notifications_path, class: "btn btn-outline-danger btn-sm", id: 'btn-remove-all', method: 'delete', remote: true %>
    <% if @notifications.blank? %> diff --git a/app/views/replies/edit.html.erb b/app/views/replies/edit.html.erb index caee8fbd43..02468f4a01 100644 --- a/app/views/replies/edit.html.erb +++ b/app/views/replies/edit.html.erb @@ -6,19 +6,18 @@
    <%= topic_title_tag(@topic) %>
    - <%= form_for [@topic, @reply], remote: true, html: { tb: 'edit-reply' } do |f| %> <%= render "shared/error_messages", target: @reply %> <%= render "/shared/editor_toolbar" %>
    <%= f.text_area :body, class: "topic-editor form-control", rows: 10 %>
    -
    - <%= f.submit t("common.save"), class: "btn btn-primary col-xs-2 hide-ios", 'data-disable-with' => t("common.saving") %> +
    + <%= f.submit t("common.save"), class: "btn btn-primary hide-ios", 'data-disable-with' => t("common.saving") %> <% if can? :destroy, @reply %> - <%= link_to t("common.delete"),[@topic,@reply], class: "btn btn-danger", method: :delete, data: { confirm: t("common.confirm_delete") } %> + <%= link_to t("common.delete"),[@topic,@reply], class: "btn btn-danger", method: :delete, data: { confirm: t("common.confirm_delete") } %> <% end %>
    <% end %>
    -
    \ No newline at end of file +
    diff --git a/app/views/settings/account.html.erb b/app/views/settings/account.html.erb index e772a9a350..024e22562b 100644 --- a/app/views/settings/account.html.erb +++ b/app/views/settings/account.html.erb @@ -1,15 +1,13 @@
    <%= render 'menu' %> -
    - <% if !Setting.sso_enabled? && @user.authorizations.any? %>
    <%= t("users.bind_another_account") %>
    - -
      - <% @user.authorizations.each do |authorizaion| %> -
    • - <%= Homeland::Utils.omniauth_name(authorizaion.provider) %> - <%= link_to(raw(''), auth_unbind_setting_path(authorizaion.provider), rel: "twitsy", title: ("users.click_to_unbind"), method: 'delete' )%> -
      • - <% end %> -
    +
    +
    + <% @user.authorizations.each do |authorizaion| %> + <%= link_to auth_unbind_setting_path(authorizaion.provider), class: "btn btn-outline-warning", title: ("users.click_to_unbind"), method: 'delete' do %> + + <%= Homeland::Utils.omniauth_name(authorizaion.provider) %> + <% end %> + <% end %> +
    +
    <% end %>
    diff --git a/app/views/settings/password.html.erb b/app/views/settings/password.html.erb index 41ef072a55..c60907e419 100644 --- a/app/views/settings/password.html.erb +++ b/app/views/settings/password.html.erb @@ -1,15 +1,13 @@
    <%= render 'menu' %> -
    <%= t("users.need_login_again_after_password_updated_html") %>
    -
    <%= form_for @user, url: setting_path, method: :put do |f| %> <%= render "shared/error_messages", target: @user %> - +
    <%= f.label :current_password %> <%= f.password_field :current_password, class: "form-control" %> @@ -18,12 +16,10 @@ <%= f.label :password %> <%= f.password_field :password, class: "form-control" %>
    -
    <%= f.label :password_confirmation %> <%= f.password_field :password_confirmation, class: "form-control" %>
    -
    <%= f.submit t("users.update_password"), class: "btn btn-primary", 'data-disable-with' => t("common.saving") %>
    diff --git a/app/views/settings/profile.html.erb b/app/views/settings/profile.html.erb index e73976b0d0..615702b775 100644 --- a/app/views/settings/profile.html.erb +++ b/app/views/settings/profile.html.erb @@ -5,7 +5,7 @@
    <%= form_for @user, url: setting_path, method: :put, html: { enctype: "multipart/form-data" } do |f| %> <%= render "shared/error_messages", target: @user %> - + <% if Setting.has_profile_field? :location %>
    <%= f.label :location %> @@ -22,7 +22,7 @@
    <%= f.label :github %>
    - https://github.com/ + https://github.com/ <%= f.text_field :github, class: "form-control" %>
    @@ -31,7 +31,7 @@
    <%= f.label :twitter %>
    - https://twitter.com/ + https://twitter.com/ <%= f.text_field :twitter, class: "form-control" %>
    @@ -48,10 +48,10 @@ field_prefix = Profile.contact_field_prefix(field) %>
    - + <% if field_prefix %>
    - <%= field_prefix %> + <%= field_prefix %> <% end %> <% if field_prefix %>
    diff --git a/app/views/settings/reward.html.erb b/app/views/settings/reward.html.erb index 7223ed6e0e..77fdf77374 100644 --- a/app/views/settings/reward.html.erb +++ b/app/views/settings/reward.html.erb @@ -1,6 +1,5 @@
    <%= render 'menu' %> -
    @@ -8,30 +7,27 @@
    <%= form_for @user, url: setting_path, method: :put, html: { enctype: "multipart/form-data" } do |f| %> <%= render "shared/error_messages", target: @user %> - - + <% User::REWARD_FIELDS.each do |field| %>
    - +
    <% if field == :alipay %> - 打开支付宝客户端：右上角 “+” -> 我要收款 -> 设定金额 -> 保存二维码图片 + 打开支付宝客户端：右上角 “+” -> 我要收款 -> 设定金额 -> 保存二维码图片 <% elsif field == :wechat %> - 打开微信手机客户端：右上角 “+” -> 收付款 -> 我要收款 -> 保存二维码图片 + 打开微信手机客户端：右上角 “+” -> 收付款 -> 我要收款 -> 保存二维码图片 <% end %>
    - <% if @user.reward_field(field) %> -
    -
    - +
    +
    + +
    -
    <% end %> <% end %> -
    @@ -50,6 +46,6 @@
    -
    +
    diff --git a/app/views/settings/show.html.erb b/app/views/settings/show.html.erb index 5a9144769c..ac60cb7399 100644 --- a/app/views/settings/show.html.erb +++ b/app/views/settings/show.html.erb @@ -1,6 +1,5 @@
    <%= render 'menu' %> -
    @@ -11,40 +10,34 @@
    <% if Setting.allow_change_login? %>
    - + <%= f.text_field :login, style: "width: 200px", class: "form-control", placeholder: t("activerecord.attributes.user.login") %>
    - <% end %> - -
    - - <%= f.text_field :name, style: "width: 200px", class: "form-control", placeholder: t("activerecord.attributes.user.name") %> -
    - -
    - - <%= f.file_field :avatar, class: "form-control" %> -
    - + <% end %> +
    + + <%= f.text_field :name, style: "width: 200px", class: "form-control", placeholder: t("activerecord.attributes.user.name") %> +
    +
    + + <%= f.file_field :avatar, class: "form-control" %> +
    +
    + + <%= f.text_field :email, disabled: @user.email_locked?, class: "form-control", placeholder: "Email" %> +
    +
    + +
    + <% if Setting.has_profile_field? :tagline %>
    - - <%= f.text_field :email, disabled: @user.email_locked?, class: "form-control", placeholder: "Email" %> -
    - -
    - + <%= f.label :tagline %> + <%= f.text_field :tagline, class: "form-control" %>
    - - <% if Setting.has_profile_field? :tagline %> -
    - <%= f.label :tagline %> - <%= f.text_field :tagline, class: "form-control" %> -
    - <% end %> + <% end %>
    -
    <%= t("activerecord.attributes.user.theme") %>
    diff --git a/app/views/shared/_captcha_input.html.erb b/app/views/shared/_captcha_input.html.erb index 5036c2bad2..3c263b7ce3 100644 --- a/app/views/shared/_captcha_input.html.erb +++ b/app/views/shared/_captcha_input.html.erb @@ -3,10 +3,10 @@ <%= recaptcha_tags site_key: Setting.recaptcha_key %> <% else %> <%= rucaptcha_input_tag(class: 'form-control', placeholder: t('common.captcha')) %> -
    +
    <%= rucaptcha_image_tag %>
    <% end %> -<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/shared/_editor_help_block.html.erb b/app/views/shared/_editor_help_block.html.erb index 849e303ab4..e48e02a1ae 100644 --- a/app/views/shared/_editor_help_block.html.erb +++ b/app/views/shared/_editor_help_block.html.erb @@ -1,34 +1,32 @@
    • 支持 Markdown 格式, **粗体**、~~删除线~~、`单行代码`
    • 支持表情，见 Emoji cheat sheet
      • -
    • 按 “M” 键查看更多 帮助
      • +
    • 按 “M” 键查看更多 帮助
    • 注意单词拼写，以及中英文排版，参考此页 -
    - -