Permalink
Browse files

Merged opf/openproject/stable/6 into opf/openproject-ce/stable/6

  • Loading branch information...
1 parent 6dfd008 commit d41287f0203d10f577eb33e99fb620faccd6466a CI committed Dec 22, 2016
@@ -1,34 +0,0 @@
-/* -- copyright
-// OpenProject My Project Page Plugin
-//
-// Copyright (C) 2011-2015 the OpenProject Foundation (OPF)
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License version 3.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-//
-// See doc/COPYRIGHT.md for more details.
-*/
-
-/*
-// Defined by Google
-// see: https://developers.google.com/identity/branding-guidelines
-// !important is necessary to overwrite the default styling options
-*/
-#top-menu #nav-login-content .login-auth-providers a.auth-provider.auth-provider-google,
-#content .login-auth-providers a.auth-provider-google,
-.modal-wrapper .login-auth-providers a.auth-provider-google {
- padding: 8px 8px 8px 50px;
- background-position-x: 8px;
- background-size: 18px 18px;
- background-color: #FFF;
- background-image: url('/assets/openid_connect/auth_provider-google.png');
-}
@@ -27,8 +27,6 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
-<%= stylesheet_link_tag 'auth_plugins/auth_plugins' %>
-
<% OpenProject::Plugins::AuthPlugin.providers.each do |pro| %>
<%
opts = {
@@ -39,17 +37,14 @@ See doc/COPYRIGHT.rdoc for more details.
opts[:origin] = params['back_url']
end
%>
- <a href="<%= url_for opts %>" class="auth-provider auth-provider-<%= pro[:name] %> button">
+ <a href="<%= url_for opts %>" class="auth-provider auth-provider-<%= pro[:name] %>">
<style type="text/css" scoped="scoped">
<% if pro[:icon] %>
#content .login-auth-providers a.auth-provider.auth-provider-<%= pro[:name] %> {
background-image: url('<%= image_path(pro[:icon]) %>');
}
#top-menu #nav-login-content .login-auth-providers a.auth-provider.auth-provider-<%= pro[:name] %> {
- background-image: url('<%= image_path(pro[:icon]) %>') ;
- }
- .modal-wrapper .login-auth-providers a.auth-provider.auth-provider-<%= pro[:name] %> {
- background-image: url('<%= image_path(pro[:icon]) %>') ;
+ background-image: url('<%= image_path(pro[:icon]) %>');
}
<% end %>
</style>
@@ -42,7 +42,5 @@ class Engine < ::Rails::Engine
initializer 'auth_plugins.register_hooks' do
require 'open_project/auth_plugins/hooks'
end
-
- assets %w(auth_plugins/auth_plugins.css)
end
end
@@ -87,6 +87,5 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<div class="generic-table--action-buttons">
<%= styled_button_tag t(:button_save), class: '-with-icon icon-checkmark' %>
</div>
- <%= styled_button_tag t(:button_save), class: '-with-icon icon-checkmark' %>
<% end %>
</costs-subform>
@@ -39,7 +39,6 @@ zh:
models:
cost_object: 预算
cost_type:
- one: 成本类型
other: 成本类型
material_budget_item: 单位
rate: 费率
@@ -27,7 +27,7 @@ def types
def subproject_condition
@subproject_condition ||= project.project_condition(Setting.display_subprojects_work_packages?)
- end
+ end
def open_work_packages_by_type
@open_work_packages_by_tracker ||= work_packages_by_type
@@ -42,6 +42,7 @@ def total_work_packages_by_type
def work_packages_by_type
WorkPackage
.visible
+ .joins(:project)
.group(:type)
.includes([:project, :status, :type])
.where(subproject_condition)
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -449,4 +449,4 @@ fieldset#filters table td > label.hidden-for-sighted, .hidden-for-sighted {
border: none;
left: 0;
}
-}
+}

0 comments on commit d41287f

Please sign in to comment.