TheDude
/
openproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/rails4

Browse Source 
Signed-off-by: Alex Coles <alex@alexbcoles.com>
pull/3011/head
Alex Coles 10 years ago
parent f493fbb036 e4183c4e78
commit 0643475c9c
144 changed files with 3615 additions and 907 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 16
      .pkgr.yml
  2. 6
      .simplecov
  3. 5
      Gemfile
  4. 1
      README.md
  5. 4
      app/assets/javascripts/application.js.erb
  6. 2
      app/assets/javascripts/autocompleter.js
  7. 2
      app/assets/javascripts/members_select_boxes.js
  8. 16
      app/assets/javascripts/timelines_select_boxes.js
  9. 30
      app/assets/stylesheets/_settings.scss
  10. 28
      app/assets/stylesheets/content/_buttons.md
  11. 27
      app/assets/stylesheets/content/_buttons.sass
  12. 27
      app/assets/stylesheets/content/_choice.md
  13. 4
      app/assets/stylesheets/content/_choice.sass
  14. 4
      app/assets/stylesheets/content/_forms.md
  15. 10
      app/assets/stylesheets/content/_forms.sass
  16. 11
      app/assets/stylesheets/content/_in_place_editing.sass
  17. 10
      app/assets/stylesheets/content/_my_page.sass
  18. 21
      app/assets/stylesheets/content/_select2.scss
  19. 5
      app/assets/stylesheets/content/_timelines.scss
  20. 15
      app/assets/stylesheets/layout/_breadcrumb.sass
  21. 1
      app/assets/stylesheets/open_project_global/_all.sass
  22. 33
      app/assets/stylesheets/open_project_global/_functions.sass
  23. 7
      app/assets/stylesheets/open_project_global/_variables.md
  24. 5
      app/assets/stylesheets/open_project_global/_variables.sass
  25. 58
      app/assets/stylesheets/timelines.css.sass
  26. 5
      app/helpers/application_helper.rb
  27. 2
      app/models/user.rb
  28. 2
      app/views/account/lost_password.html.erb
  29. 2
      app/views/account/password_recovery.html.erb
  30. 2
      app/views/account/register.html.erb
  31. 2
      app/views/auth_sources/edit.html.erb
  32. 2
      app/views/auth_sources/new.html.erb
  33. 2
      app/views/boards/edit.html.erb
  34. 2
      app/views/boards/new.html.erb
  35. 2
      app/views/boards/show.html.erb
  36. 2
      app/views/categories/edit.html.erb
  37. 2
      app/views/categories/new.html.erb
  38. 2
      app/views/custom_fields/edit.html.erb
  39. 2
      app/views/custom_fields/new.html.erb
  40. 2
      app/views/enumerations/edit.html.erb
  41. 2
      app/views/enumerations/new.html.erb
  42. 2
      app/views/groups/_general.html.erb
  43. 2
      app/views/groups/_memberships.html.erb
  44. 2
      app/views/groups/_users.html.erb
  45. 2
      app/views/groups/new.html.erb
  46. 2
      app/views/help/wiki_syntax_detailed.html.erb
  47. 2
      app/views/journals/_notes_form.html.erb
  48. 4
      app/views/members/_member_form_impaired.html.erb
  49. 4
      app/views/members/_member_form_non_impaired.html.erb
  50. 2
      app/views/messages/edit.html.erb
  51. 2
      app/views/messages/new.html.erb
  52. 2
      app/views/messages/show.html.erb
  53. 2
      app/views/my/account.html.erb
  54. 2
      app/views/my/first_login.html.erb
  55. 62
      app/views/my/page.html.erb
  56. 84
      app/views/my/page_layout.html.erb
  57. 2
      app/views/news/edit.html.erb
  58. 2
      app/views/news/new.html.erb
  59. 2
      app/views/news/show.html.erb
  60. 2
      app/views/planning_element_type_colors/_form.html.erb
  61. 2
      app/views/project_associations/edit.html.erb
  62. 2
      app/views/project_associations/new.html.erb
  63. 2
      app/views/project_types/_form.html.erb
  64. 2
      app/views/projects/_edit.html.erb
  65. 2
      app/views/projects/new.html.erb
  66. 2
      app/views/projects/settings/_activities.html.erb
  67. 2
      app/views/projects/settings/_modules.html.erb
  68. 2
      app/views/projects/settings/_repository.html.erb
  69. 2
      app/views/projects/settings/_types.html.erb
  70. 2
      app/views/reportings/edit.html.erb
  71. 2
      app/views/reportings/new.html.erb
  72. 2
      app/views/roles/edit.html.erb
  73. 2
      app/views/roles/new.html.erb
  74. 2
      app/views/roles/report.html.erb
  75. 2
      app/views/settings/_authentication.html.erb
  76. 2
      app/views/settings/_display.html.erb
  77. 2
      app/views/settings/_general.html.erb
  78. 2
      app/views/settings/_mail_handler.html.erb
  79. 2
      app/views/settings/_notifications.html.erb
  80. 2
      app/views/settings/_projects.html.erb
  81. 2
      app/views/settings/_repositories.html.erb
  82. 2
      app/views/settings/_users.html.erb
  83. 2
      app/views/settings/_work_packages.html.erb
  84. 2
      app/views/statuses/edit.html.erb
  85. 2
      app/views/statuses/new.html.erb
  86. 2
      app/views/timelines/edit.html.erb
  87. 2
      app/views/timelines/new.html.erb
  88. 2
      app/views/timelog/edit.html.erb
  89. 2
      app/views/types/_form.html.erb
  90. 2
      app/views/users/_general.html.erb
  91. 2
      app/views/users/_groups.html.erb
  92. 2
      app/views/users/_memberships.html.erb
  93. 4
      app/views/users/new.html.erb
  94. 2
      app/views/versions/edit.html.erb
  95. 2
      app/views/versions/new.html.erb
  96. 2
      app/views/watchers/_watchers.html.erb
  97. 2
      app/views/wiki/edit.html.erb
  98. 2
      app/views/wiki/new.html.erb
  99. 2
      app/views/wiki_menu_items/edit.html.erb
  100. 2
      app/views/work_package_relations/_form.html.erb
  101. Some files were not shown because too many files have changed in this diff Show More

16
.pkgr.yml
Unescape View File

@ -5,6 +5,8 @@ targets:
build_dependencies: build_dependencies:
- libmagickwand-dev - libmagickwand-dev
- libsqlite3-dev - libsqlite3-dev
debian-8:
<<: *debian
ubuntu-14.04: ubuntu-14.04:
<<: *debian <<: *debian
fedora-20: &redhat fedora-20: &redhat
@ -21,13 +23,13 @@ crons:
- packaging/cron/openproject-create-svn-repositories - packaging/cron/openproject-create-svn-repositories
services: services:
- postgres - postgres
installer: https://github.com/pkgr/installer.git#suse installer: https://github.com/pkgr/installer.git
wizards: wizards:
- https://github.com/pkgr/addon-legacy-installer.git - https://github.com/pkgr/addon-legacy-installer.git
- https://github.com/pkgr/addon-mysql.git#suse - https://github.com/pkgr/addon-mysql.git
- https://github.com/pkgr/addon-apache2.git#suse - https://github.com/pkgr/addon-apache2.git
- https://github.com/pkgr/addon-svn-dav.git#suse - https://github.com/pkgr/addon-svn-dav.git
- https://github.com/pkgr/addon-smtp.git#suse - https://github.com/pkgr/addon-smtp.git
- https://github.com/pkgr/addon-memcached.git#suse - https://github.com/pkgr/addon-memcached.git
- https://github.com/pkgr/addon-openproject.git#suse - https://github.com/pkgr/addon-openproject.git
buildpack: https://github.com/ddollar/heroku-buildpack-multi.git buildpack: https://github.com/ddollar/heroku-buildpack-multi.git

6
.simplecov
Unescape View File

@ -0,0 +1,6 @@
SimpleCov.start :rails
if ENV['CI'] == 'true'
require 'codecov'
SimpleCov.formatter = SimpleCov::Formatter::Codecov
end

5
Gemfile
Unescape View File

@ -135,7 +135,7 @@ group :test do
gem 'object-daddy', '~> 1.1.0' gem 'object-daddy', '~> 1.1.0'
gem "launchy", "~> 2.3.0" gem "launchy", "~> 2.3.0"
gem "factory_girl_rails", "~> 4.5" gem "factory_girl_rails", "~> 4.5", :require => false
gem 'cucumber-rails', "~> 1.4.2", :require => false gem 'cucumber-rails', "~> 1.4.2", :require => false
gem 'rack_session_access' gem 'rack_session_access'
# restrict because in version 1.3 a lot of tests using acts as journalized # restrict because in version 1.3 a lot of tests using acts as journalized
@ -151,6 +151,7 @@ group :test do
gem 'rspec-legacy_formatters' gem 'rspec-legacy_formatters'
gem 'capybara', '~> 2.3.0' gem 'capybara', '~> 2.3.0'
gem 'capybara-screenshot', '~> 1.0.4' gem 'capybara-screenshot', '~> 1.0.4'
gem 'capybara-select2', github: 'goodwill/capybara-select2'
gem 'selenium-webdriver', '~> 2.44.0' gem 'selenium-webdriver', '~> 2.44.0'
gem 'timecop', '~> 0.7.1' gem 'timecop', '~> 0.7.1'
@ -161,7 +162,7 @@ group :test do
gem "shoulda-matchers", '~> 2.8', require: nil gem "shoulda-matchers", '~> 2.8', require: nil
gem "json_spec" gem "json_spec"
gem "activerecord-tableless", "~> 1.0" gem "activerecord-tableless", "~> 1.0"
gem "codeclimate-test-reporter", :require => nil gem 'codecov', require: nil
gem 'equivalent-xml', '~> 0.5.1' gem 'equivalent-xml', '~> 0.5.1'
end end

1
README.md
Unescape View File

@ -2,6 +2,7 @@
[<img src="https://travis-ci.org/opf/openproject.svg?branch=feature/rails4" alt="Build Status" />](https://travis-ci.org/opf/openproject) [<img src="https://travis-ci.org/opf/openproject.svg?branch=feature/rails4" alt="Build Status" />](https://travis-ci.org/opf/openproject)
[<img src="https://gemnasium.com/opf/openproject.png" alt="Dependency Status" />](https://gemnasium.com/opf/openproject) [<img src="https://gemnasium.com/opf/openproject.png" alt="Dependency Status" />](https://gemnasium.com/opf/openproject)
[![Code Climate](https://codeclimate.com/github/opf/openproject/badges/gpa.svg)](https://codeclimate.com/github/opf/openproject) [![Code Climate](https://codeclimate.com/github/opf/openproject/badges/gpa.svg)](https://codeclimate.com/github/opf/openproject)
[![codecov.io](http://codecov.io/github/opf/openproject/coverage.svg?branch=dev)](http://codecov.io/github/opf/openproject?branch=dev)
[![Inline docs](http://inch-ci.org/github/opf/openproject.png?branch=dev)](http://inch-ci.org/github/opf/openproject) [![Inline docs](http://inch-ci.org/github/opf/openproject.png?branch=dev)](http://inch-ci.org/github/opf/openproject)
[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/opf/openproject?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/opf/openproject?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

4
app/assets/javascripts/application.js.erb
Unescape View File

@ -573,6 +573,10 @@ jQuery(document).ready(function($) {
}, },
formatSearching: function () { formatSearching: function () {
return I18n.t("js.select2.searching"); return I18n.t("js.select2.searching");
},
containerCssClass: 'form--select2',
adaptContainerCssClass: function(clazz) {
return null;
} }
}); });

2
app/assets/javascripts/autocompleter.js
Unescape View File

@ -187,7 +187,7 @@
return markup.join(""); return markup.join("");
}, },
formatSelection: function (item) { formatSelection: function (item) {
return item.name; return OpenProject.Helpers.markupEscape(item.name);
}, },
initSelection: function (element, callback) { initSelection: function (element, callback) {
var data = [], multiple; var data = [], multiple;

2
app/assets/javascripts/members_select_boxes.js
Unescape View File

@ -51,7 +51,7 @@ jQuery(document).ready(function($) {
}; };
formatItemSelection = function (item) { formatItemSelection = function (item) {
return item.name; return OpenProject.Helpers.markupEscape(item.name);
}; };
$("#members_add_form select.select2-select").each(function (ix, elem){ $("#members_add_form select.select2-select").each(function (ix, elem){

16
app/assets/javascripts/timelines_select_boxes.js
Unescape View File

@ -29,6 +29,10 @@
//requires 'autocompleter' //requires 'autocompleter'
jQuery(document).ready(function($) { jQuery(document).ready(function($) {
var formatSelection = function(item) {
return OpenProject.Helpers.markupEscape(item.name || (item.project ? item.project.name : ''));
};
[ [
$("#reporting_reported_project_status_id"), $("#reporting_reported_project_status_id"),
$("#timeline_options_initial_outline_expansion"), $("#timeline_options_initial_outline_expansion"),
@ -98,9 +102,7 @@ jQuery(document).ready(function($) {
// Stuff borrowed from Core application.js Project Jump Box // Stuff borrowed from Core application.js Project Jump Box
$(item).autocomplete({ $(item).autocomplete({
multiple: false, multiple: false,
formatSelection: function (item) { formatSelection: formatSelection,
return item.name || item.project.name;
},
formatResult : OpenProject.Helpers.Search.formatter, formatResult : OpenProject.Helpers.Search.formatter,
matcher : OpenProject.Helpers.Search.matcher, matcher : OpenProject.Helpers.Search.matcher,
query : OpenProject.Helpers.Search.projectQueryWithHierarchy( query : OpenProject.Helpers.Search.projectQueryWithHierarchy(
@ -117,9 +119,7 @@ jQuery(document).ready(function($) {
$(item).autocomplete({ $(item).autocomplete({
multiple: true, multiple: true,
sortable: true, sortable: true,
formatSelection: function (item) { formatSelection: formatSelection,
return item.name || item.project.name;
},
formatResult : OpenProject.Helpers.Search.formatter, formatResult : OpenProject.Helpers.Search.formatter,
matcher : OpenProject.Helpers.Search.matcher, matcher : OpenProject.Helpers.Search.matcher,
query : OpenProject.Helpers.Search.projectQueryWithHierarchy( query : OpenProject.Helpers.Search.projectQueryWithHierarchy(
@ -135,9 +135,7 @@ jQuery(document).ready(function($) {
// Stuff borrowed from Core application.js Project Jump Box // Stuff borrowed from Core application.js Project Jump Box
$(item).autocomplete({ $(item).autocomplete({
multiple: true, multiple: true,
formatSelection: function (item) { formatSelection: formatSelection,
return item.name || item.project.name;
},
formatResult : OpenProject.Helpers.Search.formatter, formatResult : OpenProject.Helpers.Search.formatter,
matcher : OpenProject.Helpers.Search.matcher, matcher : OpenProject.Helpers.Search.matcher,
query : OpenProject.Helpers.Search.projectQueryWithHierarchy( query : OpenProject.Helpers.Search.projectQueryWithHierarchy(

30
app/assets/stylesheets/_settings.scss
Unescape View File

@ -43,13 +43,13 @@ $include-css: (
block-list: false, block-list: false,
button: false, button: false,
button-group: false, button-group: false,
card: false, card: true,
coloring: false, coloring: false,
extras: false, extras: false,
forms: false, forms: false,
grid: true, grid: true,
iconic: false, iconic: false,
label: false, label: true,
badge: false, badge: false,
list: false, list: false,
menu-bar: false, menu-bar: false,
@ -321,15 +321,15 @@ $button-radius: 2px;
// 11. Card // 11. Card
// - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - -
// $card-background: #fff; $card-background: #fff;
// $card-color: isitlight($card-background); $card-color: isitlight($card-background);
// $card-border: 1px solid smartscale($card-background, 7%); $card-border: 1px solid;
// $card-radius: $global-radius; $card-radius: 0;
// $card-shadow: 0 1px 2px rgba(#000, 0.2); $card-shadow: none;
// $card-padding: $global-padding; $card-padding: 10px;
// $card-margin: 0.5rem; $card-margin: 0.5rem;
// $card-divider-background: smartscale($card-background, 7%); $card-divider-background: smartscale($card-background, 7%);
// 12. Extras // 12. Extras
// - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - -
@ -408,11 +408,11 @@ $form-padding: 0.375rem;
// 15. Label // 15. Label
// - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - -
// $label-fontsize: 0.8rem; $label-fontsize: 1em;
// $label-padding: ($global-padding / 3) ($global-padding / 2); $label-padding: 10px;
// $label-radius: 0; $label-radius: 10px;
// $label-background: $primary-color; $label-background: $gray;
// $label-color: isitlight($primary-color); $label-color: $gray-dark;
// $badge-fontsize: 0.8em; // $badge-fontsize: 0.8em;
// $badge-diameter: 1.5rem; // $badge-diameter: 1.5rem;

28
app/assets/stylesheets/content/_buttons.md
Unescape View File

@ -21,15 +21,15 @@
## Highlight buttons ## Highlight buttons
``` ```
<button class="button ***-highlight***"><i class="button--icon icon-attention2"></i><span class="button--text">Apply</span></button> <button class="button ***-highlight***"><i class="button--icon icon-yes"></i><span class="button--text">Apply</span></button>
<button class="button ***-highlight***"><i class="button--icon icon-attention2"></i></button> <button class="button ***-highlight***"><i class="button--icon icon-yes"></i></button>
<button class="button ***-highlight***">Apply</button> <button class="button ***-highlight***">Apply</button>
<button class="button ***-highlight***" disabled> <button class="button ***-highlight***" disabled>
<i class="button--icon icon-attention2"></i><span class="button--text">Apply</span> <i class="button--icon icon-yes"></i><span class="button--text">Apply</span>
</button> </button>
<br> <br>
<a href="#" class="button ***-highlight*** -with-icon icon-attention2">Apply</a> <a href="#" class="button ***-highlight*** -with-icon icon-yes">Apply</a>
<a href="#" class="button ***-highlight***">Click to apply</a> <a href="#" class="button ***-highlight***">Click to apply</a>
<input type="submit" class="button ***-highlight***" value="Submit to apply"/> <input type="submit" class="button ***-highlight***" value="Submit to apply"/>
@ -37,22 +37,22 @@
``` ```
## Success buttons ## Alternative highlight buttons
``` ```
<button class="button ***-success***"><i class="button--icon icon-yes"></i><span class="button--text">Save</span></button> <button class="button ***-alt-highlight***"><i class="button--icon icon-add"></i><span class="button--text">Create</span></button>
<button class="button ***-success***"><i class="button--icon icon-yes"></i></button> <button class="button ***-alt-highlight***"><i class="button--icon icon-add"></i></button>
<button class="button ***-success***">Save</button> <button class="button ***-alt-highlight***">Create</button>
<button class="button ***-success***" disabled> <button class="button ***-alt-highlight***" disabled>
<i class="button--icon icon-yes"></i><span class="button--text">Save</span> <i class="button--icon icon-add"></i><span class="button--text">Create</span>
</button> </button>
<br> <br>
<a href="#" class="button ***-success*** -with-icon icon-yes">Save</a> <a href="#" class="button ***-alt-highlight*** -with-icon icon-add">Create</a>
<a href="#" class="button ***-success***">Click to save</a> <a href="#" class="button ***-alt-highlight***">Click to create</a>
<input type="submit" class="button ***-success***" value="Submit to save"/> <input type="submit" class="button ***-alt-highlight***" value="Submit to create"/>
<input type="submit" class="button ***-success***" value="Do not save" disabled /> <input type="submit" class="button ***-alt-highlight***" value="Do not create" disabled />
``` ```

27
app/assets/stylesheets/content/_buttons.sass
Unescape View File

@ -39,16 +39,12 @@ $button--highlight-font-color: white !default
$button--highlight-background-color: $primary-color !default $button--highlight-background-color: $primary-color !default
$button--highlight-background-hover-color: $primary-color-dark !default $button--highlight-background-hover-color: $primary-color-dark !default
$button--success-font-color: white !default $button--alt-highlight-font-color: white !default
$button--success-background-color: $success-color !default $button--alt-highlight-background-color: $alternative-color !default
$button--success-background-hover-color: darken($success-color, 18%) !default $button--alt-highlight-background-hover-color: darken($alternative-color, 18%) !default
$button--text-icon-spacing: 0.65em !default $button--text-icon-spacing: 0.65em !default
%button--icon
display: inline-block
transition: scale 0.25s ease-out
.button, .button,
a.button a.button
@extend %button @extend %button
@ -67,17 +63,10 @@ a.button
&:hover &:hover
text-decoration: none text-decoration: none
.button--icon
transform: scale(1.15)
&.-with-icon &.-with-icon
&::before &::before
@extend %button--icon
padding: 0 $button--text-icon-spacing 0 0 padding: 0 $button--text-icon-spacing 0 0
&:hover::before
transform: scale(1.15)
&.-highlight &.-highlight
@include button-style($button--highlight-background-color, $button--highlight-background-hover-color, $button--highlight-font-color, $button-style) @include button-style($button--highlight-background-color, $button--highlight-background-hover-color, $button--highlight-font-color, $button-style)
border-color: $button--highlight-background-color border-color: $button--highlight-background-color
@ -86,12 +75,12 @@ a.button
border-color: $button--highlight-background-hover-color border-color: $button--highlight-background-hover-color
&.-success &.-alt-highlight
@include button-style($button--success-background-color, $button--success-background-hover-color, $button--success-font-color, $button-style) @include button-style($button--alt-highlight-background-color, $button--alt-highlight-background-hover-color, $button--alt-highlight-font-color, $button-style)
border-color: $button--success-background-color border-color: $button--alt-highlight-background-color
&:hover, &:focus &:hover, &:focus
border-color: $button--success-background-hover-color border-color: $button--alt-highlight-background-hover-color
&.-active &.-active
@ -129,7 +118,7 @@ a.button
border-radius: 2em border-radius: 2em
.button--icon .button--icon
@extend %button--icon @include icon-common
.button--icon + .button--text, .button--icon + .button--text,
.button--text + .button--icon .button--text + .button--icon

27
app/assets/stylesheets/content/_choice.md
Unescape View File

@ -19,3 +19,30 @@ For selection from a list without having to use a form. This can be reused for s
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
``` ```
## Choice with inline label and input
A more complex example for a choice combined with further inputs.
```
<div class="choice">
<div class="choice--select">
<span class="inline-label">
<select class="select2">
<option value="">one</option>
<option value="">two</option>
<option value="">three</option>
<option value="">over nine thousand!!!</option>
</select>
<span class="form-label">multiplied by</span>
<input class="form--text-field" size="10" type="text">
</span>
</div>
<div class="choice--button">
<button class="button">
<i class="icon-edit"></i> Edit
</button>
</div>
</div>
<div class="clearfix"></div>
```

4
app/assets/stylesheets/content/_choice.sass
Unescape View File

@ -26,8 +26,8 @@
// See doc/COPYRIGHT.rdoc for more details. // See doc/COPYRIGHT.rdoc for more details.
//++ //++
//a little hack, the width will be just fine for this element //a hack for IE, the width will be just fine for this element
$choice-parent-relation-select-width: 325px $choice-parent-relation-select-width: 375px
//resolve the problem if inside are elements with float //resolve the problem if inside are elements with float
.detail-panel-description-content .detail-panel-description-content

4
app/assets/stylesheets/content/_forms.md
Unescape View File

@ -14,7 +14,7 @@
</div> </div>
<hr class="form--separator"> <hr class="form--separator">
<button class="button -success">Save</button> <button class="button -highlight">Save</button>
<button class="button">Cancel</button> <button class="button">Cancel</button>
</form> </form>
``` ```
@ -33,7 +33,7 @@
</div> </div>
<hr class="form--separator"> <hr class="form--separator">
<button class="button -success">Save</button> <button class="button -highlight">Save</button>
<button class="button">Cancel</button> <button class="button">Cancel</button>
</form> </form>
``` ```

10
app/assets/stylesheets/content/_forms.sass
Unescape View File

@ -381,7 +381,11 @@ fieldset.form--fieldset
.form--select .form--select
@extend %input-style @extend %input-style
line-height: 1.5 line-height: normal
padding: rem-concat-list($select-element-padding)
// TODO: Temporary fix, for sure it will be fixed with next foundation-app release v1.1.1
// remove background image after/if upgrade
background-image: url("data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20version%3D%221.1%22%20width%3D%2232%22%20height%3D%2224%22%20viewBox%3D%220%200%2032%2024%22%3E%3Cpolygon%20points%3D%220%2C0%2032%2C0%2016%2C24%22%20style%3D%22fill%3A%20black%22%3E%3C/polygon%3E%3C/svg%3E")
&[multiple] &[multiple]
background-image: none background-image: none
@ -390,6 +394,10 @@ fieldset.form--fieldset
// in height in foundation for apps. // in height in foundation for apps.
height: auto height: auto
.form--select2
border: none
padding-right: 0
.form--text-field, .form--text-field,
.form--select .form--select
&.-tiny &.-tiny

11
app/assets/stylesheets/content/_in_place_editing.sass
Unescape View File

@ -29,6 +29,9 @@
$inplace-edit--border-color: #ddd $inplace-edit--border-color: #ddd
$inplace-edit--dark-background: #f8f8f8 $inplace-edit--dark-background: #f8f8f8
$inplace-edit--color--very-dark: #cacaca $inplace-edit--color--very-dark: #cacaca
$inplace-edit--color-highlight: #0a97dd
$inplace-edit--selected-date-border-color: #008bd0
$inplace-edit--color-highlight: #0a97dd
%inline-date-picker-container-position-absolute %inline-date-picker-container-position-absolute
@ -76,10 +79,8 @@ $inplace-edit--color--very-dark: #cacaca
& > .inplace-edit--date-range-end-date-picker & > .inplace-edit--date-range-end-date-picker
@extend %inline-date-picker-container-position-absolute @extend %inline-date-picker-container-position-absolute
right: 0 right: 0
.ui-datepicker .ui-datepicker-calendar td a.ui-state-active
.ui-datepicker-current, border-color: $inplace-edit--selected-date-border-color
.ui-datepicker-close
display: none
#ui-datepicker-div #ui-datepicker-div
z-index: 9999 !important z-index: 9999 !important
@ -262,3 +263,5 @@ a.inplace-editing--trigger-link,
.work-packages--details--title .work-packages--details--title
margin-left: -0.375rem margin-left: -0.375rem
.inplace-edit--highlight
border-color: $inplace-edit--color-highlight !important

10
app/assets/stylesheets/content/_my_page.sass
Unescape View File

@ -41,13 +41,21 @@ div.box-actions
margin-right: 16px margin-right: 16px
z-index: 500 z-index: 500
#invisible-grid
#list-top
padding: 0 4px
#list-right
padding: 0 4px 0 10px
#list-left
padding: 0 10px 0px 4px
.block-receiver .block-receiver
border: 1px dashed $my-page-edit-box-border-color border: 1px dashed $my-page-edit-box-border-color
margin-bottom: 20px margin-bottom: 20px
padding: 15px 0 15px 0 padding: 15px 0 15px 0
#visible-grid & #visible-grid &
@extend .grid-content
min-height: 32px min-height: 32px
// TODO: this fixes an issue which currently breaks the layout // TODO: this fixes an issue which currently breaks the layout
// It has to be removed once it is fixed upstream // It has to be removed once it is fixed upstream

21
app/assets/stylesheets/content/_select2.scss
Unescape View File

@ -80,12 +80,6 @@
text-overflow: ellipsis; text-overflow: ellipsis;
} }
/* Fix search input in IE8 - input was to high */
.select2-search input {
min-height: 0\9;
}
.controller-work_packages.action-index .select2-drop:not(.project-search-results) .select2-results .select2-result-selectable { .controller-work_packages.action-index .select2-drop:not(.project-search-results) .select2-results .select2-result-selectable {
color: #000; color: #000;
} }
@ -118,11 +112,11 @@
//$se2- select2 var prefix //$se2- select2 var prefix
$se2-theme-selectable-color: #f8f8f8; $se2-theme-selectable-color: #f8f8f8;
//todo change to global theme color var
//{bgThemeHighlight} //{bgThemeHighlight}
$se2-theme-selectable-color-highlighted: $drop-down-selected-bg-color; $se2-theme-selectable-color-highlighted: $drop-down-selected-bg-color;
$se2-element-height: 33px; $se2-element-height: 33px;
$se2-input-height: rem-calc(34px);
$se2-line-height: 30px; $se2-line-height: 30px;
$se2-button-width: 28px; $se2-button-width: 28px;
$se2-arrow-button-width: 18px; $se2-arrow-button-width: 18px;
@ -137,21 +131,21 @@ $se2-width: 100%;
.select2-container { .select2-container {
//Indirectly styling size of result list //Indirectly styling size of result list
max-width: $se2-max-width; max-width: $se2-max-width;
position: relative;
width: $se2-width; width: $se2-width;
.select2-choice { .select2-choice {
border-radius: 0; border-radius: 0;
box-shadow: none; box-shadow: none;
background: none;
height: $se2-element-height; height: $se2-element-height;
line-height: $se2-element-height; line-height: $se2-element-height;
> span { .select2-chosen {
line-height: $se2-line-height; line-height: $se2-line-height;
} }
> div { .select2-arrow {
background-color: $se2-theme-selectable-color; background: $se2-theme-selectable-color none;
border-radius: 0; border-radius: 0;
line-height: $se2-line-height; line-height: $se2-line-height;
text-align: center; text-align: center;
@ -178,6 +172,7 @@ $se2-width: 100%;
} }
&.select2-dropdown-open { &.select2-dropdown-open {
.select2-choice { .select2-choice {
background-color: $se2-theme-selectable-color; background-color: $se2-theme-selectable-color;
} }
@ -200,3 +195,7 @@ $se2-width: 100%;
} }
} }
} }
input[type="text"].select2-input {
height: $se2-input-height;
}

5
app/assets/stylesheets/content/_timelines.scss
Unescape View File

@ -71,6 +71,11 @@
} }
} }
//HACK: Use a min-height to ensure that the timeline_select select2 is not cropped at the bottom
.controller-timelines #content {
min-height: 700px;
}
#content { #content {
.meta table.timelines-attributes { .meta table.timelines-attributes {
th, td { th, td {

15
app/assets/stylesheets/layout/_breadcrumb.sass
Unescape View File

@ -26,6 +26,9 @@
// See doc/COPYRIGHT.rdoc for more details. // See doc/COPYRIGHT.rdoc for more details.
//++ //++
%breadcrumb--default-font
@include default-font($breadcrumb-font-color, $breadcrumb-font-size, bold)
#breadcrumb #breadcrumb
@include default-transition @include default-transition
height: $breadcrumb-height height: $breadcrumb-height
@ -47,14 +50,13 @@
h1 h1
margin-bottom: 0 margin-bottom: 0
margin-left: 13px margin-left: 13px
@include default-font($breadcrumb-font-color, $breadcrumb-font-size)
a a
@include default-font($breadcrumb-font-color, $breadcrumb-font-size, bold) @extend %breadcrumb--default-font
text-decoration: none
&:hover
text-decoration: underline
li li
@extend %breadcrumb--default-font
color: lighten($breadcrumb-font-color, 20)
list-style-type: none list-style-type: none
white-space: nowrap white-space: nowrap
&.cutme &.cutme
@ -77,6 +79,7 @@ ul.breadcrumb
text-decoration: none text-decoration: none
display: block display: block
width: 25px width: 25px
font-size: 12px
#breadcrumb ul.breadcrumb li #breadcrumb ul.breadcrumb li
float: left float: left
@ -84,5 +87,3 @@ ul.breadcrumb
padding: 0 25px 0 0 padding: 0 25px 0 0
background: image-url('breadcrumb-list.png') no-repeat right center background: image-url('breadcrumb-list.png') no-repeat right center
#breadcrumb a.breadcrumb-project-title
font-size: $breadcrumb-highlighted-font-size

1
app/assets/stylesheets/open_project_global/_all.sass
Unescape View File

@ -34,3 +34,4 @@ $asset-pipeline: function-exists(font-url)
@import open_project_global/accessibility @import open_project_global/accessibility
@import open_project_global/variables @import open_project_global/variables
@import open_project_global/mixins @import open_project_global/mixins
@import open_project_global/functions

33
app/assets/stylesheets/open_project_global/_functions.sass
Unescape View File

@ -0,0 +1,33 @@
//-- copyright
// OpenProject is a project management system.
// Copyright (C) 2012-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.
//
// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
// Copyright (C) 2006-2013 Jean-Philippe Lang
// Copyright (C) 2010-2013 the ChiliProject Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// 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.rdoc for more details.
//++
@function rem-concat-list($list-of-pixels)
$result: ''
@each $pixel-val in $list-of-pixels
$result: $result + rem-calc($pixel-val) + ' '
@return #{$result}

7
app/assets/stylesheets/open_project_global/_variables.md
Unescape View File

@ -5,7 +5,8 @@ Color Variables
``` ```
@colors @colors
- $body-font-color - - - $body-font-color -
- $header-bg-color - $header-logo-bg-color - - $primary-color $primary-color-dark
- $gray-light $gray $gray-dark - $alternative-color -
$gray-light $gray $gray-dark
``` ```

5
app/assets/stylesheets/open_project_global/_variables.sass
Unescape View File

@ -40,8 +40,7 @@ $base-line-height: 1.5 !default
$primary-color: #3493B3 !default $primary-color: #3493B3 !default
$primary-color-dark: #06799F !default $primary-color-dark: #06799F !default
$secondary-color: #bfbfbf !default $secondary-color: #bfbfbf !default
$alternative-color: #35c53f !default
$success-color: #35c53f !default
$h1-font-size: 2rem !default $h1-font-size: 2rem !default
$h1-font-color: $body-font-color !default $h1-font-color: $body-font-color !default
@ -182,3 +181,5 @@ $user-avatar-border-radius: 50px !default
$user-avatar-width: 36px !default $user-avatar-width: 36px !default
$user-avatar-mini-border-radius: 50px !default $user-avatar-mini-border-radius: 50px !default
$user-avatar-mini-width: 20px !default $user-avatar-mini-width: 20px !default
$select-element-padding: 3px, 24px, 3px, 3px

58
app/assets/stylesheets/timelines.css.sass
Unescape View File

@ -90,11 +90,6 @@ li.select2-result.select2-visible-selected-parent
input input
margin-left: 1em margin-left: 1em
/* Hack for as long as select2 is in there.
.select2-container.form--select
border: none
padding-right: 0
/* ╭───────────────────────────────────────────────────────────────────╮ * /* ╭───────────────────────────────────────────────────────────────────╮ *
* │ Timeline toolbar & icons. │ * * │ Timeline toolbar & icons. │ *
* ╰───────────────────────────────────────────────────────────────────╯ * ╰───────────────────────────────────────────────────────────────────╯
@ -114,56 +109,37 @@ li.select2-result.select2-visible-selected-parent
.tl-toolbar-container * .tl-toolbar-container *
vertical-align: bottom vertical-align: bottom
.tl-icon-postponed, .tl-icon-preponed, .tl-icon-added, .tl-icon-deleted, .tl-icon-changed, .tl-icon-calendar, .tl-icon-zoomin, .tl-icon-zoomout, .tl-icon-outline .tl-icon-postponed,
background-position: 0% 50% .tl-icon-preponed,
.tl-icon-added,
.tl-icon-deleted,
.tl-icon-changed,
.tl-icon-calendar,
.tl-icon-zoomin,
.tl-icon-zoomout,
.tl-icon-outline
cursor: default
background-position: left center
background-repeat: no-repeat background-repeat: no-repeat
padding-left: 19px padding-left: 19px
padding-top: 2px
padding-bottom: 3px
.tl-icon-postponed .tl-icon-postponed
cursor: default background-image: image-url("bullet_red.png")
background: image-url("bullet_red.png") no-repeat center
.tl-icon-preponed .tl-icon-preponed
cursor: default background-image: image-url("bullet_green.png")
background: image-url("bullet_green.png") no-repeat center
.tl-icon-added .tl-icon-added
cursor: default background-image: image-url("added.png")
background: image-url("added.png") no-repeat center
display: inline
width: 16px
background-position: 2px 2px
.tl-icon-deleted .tl-icon-deleted
cursor: default background-image: image-url("webalys/deleted.png")
background: image-url("webalys/deleted.png") no-repeat center
display: inline
width: 16px
background-position: 2px 2px
.tl-icon-changed .tl-icon-changed
cursor: default background-image: image-url("webalys/arrow_left_right.png")
background: image-url("webalys/arrow_left_right.png") no-repeat center
display: inline
width: 16px
background-position: 2px 2px
.tl-icon-calendar .tl-icon-calendar
cursor: default background-image: image-url("webalys/calendar.png")
background: image-url("webalys/calendar.png") no-repeat center
display: inline
width: 16px
.tl-icon-zoomin
background: image-url("webalys/zoom_in.png") no-repeat center
.tl-icon-zoomout
background: image-url("webalys/zoom_out.png") no-repeat center
.tl-icon-outline
background: image-url("webalys/outline.png") no-repeat center
/* ╭───────────────────────────────────────────────────────────────────╮ * /* ╭───────────────────────────────────────────────────────────────────╮ *
* │ Timeline tree │ * * │ Timeline tree │ *

5
app/helpers/application_helper.rb
Unescape View File

@ -487,7 +487,7 @@ module ApplicationHelper
def calendar_for(field_id) def calendar_for(field_id)
include_calendar_headers_tags include_calendar_headers_tags
javascript_tag("jQuery('##{field_id}').datepicker();") javascript_tag("jQuery(function() { jQuery('##{field_id}').datepicker(); })")
end end
def include_calendar_headers_tags def include_calendar_headers_tags
@ -504,7 +504,8 @@ module ApplicationHelper
else else
'' # use language '' # use language
end end
js = "var CS = { lang: '#{current_language.to_s.downcase}', firstWeekDay: '#{start_of_week}' };" # FIXME: Get rid of this abomination
js = "var CS = { lang: '#{current_language.to_s.downcase}', firstDay: #{start_of_week} };"
javascript_tag(js) javascript_tag(js)
end end
end end

2
app/models/user.rb
Unescape View File

@ -144,7 +144,7 @@ class User < Principal
validates_uniqueness_of :login, if: Proc.new { |user| !user.login.blank? }, case_sensitive: false validates_uniqueness_of :login, if: Proc.new { |user| !user.login.blank? }, case_sensitive: false
validates_uniqueness_of :mail, allow_blank: true, case_sensitive: false validates_uniqueness_of :mail, allow_blank: true, case_sensitive: false
# Login must contain letters, numbers, underscores only # Login must contain letters, numbers, underscores only
validates_format_of :login, with: /\A[a-z0-9_\-@\.+]*\z/i validates_format_of :login, with: /\A[a-z0-9_\-@\. ]*\z/i
validates_length_of :login, maximum: 256 validates_length_of :login, maximum: 256
validates_length_of :firstname, :lastname, maximum: 30 validates_length_of :firstname, :lastname, maximum: 30
validates_format_of :mail, with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, allow_blank: true validates_format_of :mail, with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, allow_blank: true

2
app/views/account/lost_password.html.erb
Unescape View File

@ -36,6 +36,6 @@ See doc/COPYRIGHT.rdoc for more details.
<%= styled_text_field_tag 'mail', nil, :size => 40 %> <%= styled_text_field_tag 'mail', nil, :size => 40 %>
</span> </span>
</div> </div>
<%= styled_button_tag l(:button_submit), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_submit), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>
</section> </section>

2
app/views/account/password_recovery.html.erb
Unescape View File

@ -48,5 +48,5 @@ See doc/COPYRIGHT.rdoc for more details.
</div> </div>
</div> </div>
</section> </section>
<p><%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %></p> <p><%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %></p>
<% end %> <% end %>

2
app/views/account/register.html.erb
Unescape View File

@ -85,5 +85,5 @@ See doc/COPYRIGHT.rdoc for more details.
locals: { form: f } %> locals: { form: f } %>
</section> </section>
<%= styled_button_tag l(:button_submit), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_submit), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/auth_sources/edit.html.erb
Unescape View File

@ -33,5 +33,5 @@ See doc/COPYRIGHT.rdoc for more details.
<%= labelled_tabular_form_for @auth_source, :as => :auth_source do |f| %> <%= labelled_tabular_form_for @auth_source, :as => :auth_source do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/auth_sources/new.html.erb
Unescape View File

@ -33,5 +33,5 @@ See doc/COPYRIGHT.rdoc for more details.
<%= labelled_tabular_form_for @auth_source, :as => :auth_source do |f| %> <%= labelled_tabular_form_for @auth_source, :as => :auth_source do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<%= styled_button_tag l(:button_create), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_create), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/boards/edit.html.erb
Unescape View File

@ -31,5 +31,5 @@ See doc/COPYRIGHT.rdoc for more details.
<%= labelled_tabular_form_for [@project, @board] do |f| %> <%= labelled_tabular_form_for [@project, @board] do |f| %>
<%= render :partial => 'form', :locals => {:f => f} %> <%= render :partial => 'form', :locals => {:f => f} %>
<%= f.button l(:button_save), class: 'button -success -with-icon icon-yes' %> <%= f.button l(:button_save), class: 'button -highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/boards/new.html.erb
Unescape View File

@ -31,5 +31,5 @@ See doc/COPYRIGHT.rdoc for more details.
<%= labelled_tabular_form_for [@project, @board] do |f| %> <%= labelled_tabular_form_for [@project, @board] do |f| %>
<%= render :partial => 'form', :locals => {:f => f} %> <%= render :partial => 'form', :locals => {:f => f} %>
<%= f.button l(:button_create), class: 'button -success -with-icon icon-yes' %> <%= f.button l(:button_create), class: 'button -highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/boards/show.html.erb
Unescape View File

@ -48,7 +48,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= render partial: 'messages/form', locals: {f: f} %> <%= render partial: 'messages/form', locals: {f: f} %>
<hr class="form--separator"> <hr class="form--separator">
<%= styled_button_tag l(:button_create), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_create), class: '-highlight -with-icon icon-yes' %>
<%= preview_link preview_board_topics_path(@board), 'message-form-preview' %> <%= preview_link preview_board_topics_path(@board), 'message-form-preview' %>
<%= link_to l(:button_cancel), "#", onclick: 'Element.hide("add-message")', class: 'button' %> <%= link_to l(:button_cancel), "#", onclick: 'Element.hide("add-message")', class: 'button' %>
<% end %> <% end %>

2
app/views/categories/edit.html.erb
Unescape View File

@ -29,5 +29,5 @@ See doc/COPYRIGHT.rdoc for more details.
<h2><%= Category.model_name.human %></h2> <h2><%= Category.model_name.human %></h2>
<%= labelled_tabular_form_for @category, :as => :category do |f| %> <%= labelled_tabular_form_for @category, :as => :category do |f| %>
<%= render :partial => 'categories/form', :locals => { :f => f } %> <%= render :partial => 'categories/form', :locals => { :f => f } %>
<%= f.button l(:button_save), class: 'button -success -with-icon icon-yes' %> <%= f.button l(:button_save), class: 'button -highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/categories/new.html.erb
Unescape View File

@ -29,5 +29,5 @@ See doc/COPYRIGHT.rdoc for more details.
<h2><%=l(:label_work_package_category_new)%></h2> <h2><%=l(:label_work_package_category_new)%></h2>
<%= labelled_tabular_form_for [@project, @category], :as => :category do |f| %> <%= labelled_tabular_form_for [@project, @category], :as => :category do |f| %>
<%= render :partial => 'categories/form', :locals => { :f => f } %> <%= render :partial => 'categories/form', :locals => { :f => f } %>
<%= f.button l(:button_create), class: 'button -success -with-icon icon-yes' %> <%= f.button l(:button_create), class: 'button -highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/custom_fields/edit.html.erb
Unescape View File

@ -37,5 +37,5 @@ See doc/COPYRIGHT.rdoc for more details.
:url => custom_field_path(@custom_field), :url => custom_field_path(@custom_field),
:html => {:method => :put, :id => 'custom_field_form'} do |f| %> :html => {:method => :put, :id => 'custom_field_form'} do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/custom_fields/new.html.erb
Unescape View File

@ -38,5 +38,5 @@ See doc/COPYRIGHT.rdoc for more details.
:html => {:id => 'custom_field_form'} do |f| %> :html => {:id => 'custom_field_form'} do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<%= hidden_field_tag 'type', @custom_field.type %> <%= hidden_field_tag 'type', @custom_field.type %>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/enumerations/edit.html.erb
Unescape View File

@ -33,7 +33,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= labelled_tabular_form_for @enumeration do |f| %> <%= labelled_tabular_form_for @enumeration do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>
<%= styled_form_tag(enumeration_path(@enumeration), :method => :delete) do %> <%= styled_form_tag(enumeration_path(@enumeration), :method => :delete) do %>

2
app/views/enumerations/new.html.erb
Unescape View File

@ -33,5 +33,5 @@ See doc/COPYRIGHT.rdoc for more details.
<%= labelled_tabular_form_for @enumeration do |f| %> <%= labelled_tabular_form_for @enumeration do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<%= styled_button_tag l(:button_create), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_create), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/groups/_general.html.erb
Unescape View File

@ -29,5 +29,5 @@ See doc/COPYRIGHT.rdoc for more details.
<%= labelled_tabular_form_for @group, :url => group_path(@group), :html => {:method => :put}, :as => :group do |f| %> <%= labelled_tabular_form_for @group, :url => group_path(@group), :html => {:method => :put}, :as => :group do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/groups/_memberships.html.erb
Unescape View File

@ -90,7 +90,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= labeled_check_box_tags 'membership[role_ids][]', roles %> <%= labeled_check_box_tags 'membership[role_ids][]', roles %>
</div> </div>
</div> </div>
<div><%= styled_button_tag l(:button_add), class: '-success -with-icon icon-yes' %></div> <div><%= styled_button_tag l(:button_add), class: '-highlight -with-icon icon-yes' %></div>
</fieldset> </fieldset>
<% end %> <% end %>
<% end %> <% end %>

2
app/views/groups/_users.html.erb
Unescape View File

@ -79,7 +79,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= principals_check_box_tags 'user_ids[]', users %> <%= principals_check_box_tags 'user_ids[]', users %>
</div> </div>
</div> </div>
<div><%= styled_button_tag l(:button_add), class: '-success -with-icon icon-yes' %></div> <div><%= styled_button_tag l(:button_add), class: '-highlight -with-icon icon-yes' %></div>
</fieldset> </fieldset>
<% end %> <% end %>
<% end %> <% end %>

2
app/views/groups/new.html.erb
Unescape View File

@ -33,5 +33,5 @@ See doc/COPYRIGHT.rdoc for more details.
<%= labelled_tabular_form_for(@group) do |f| %> <%= labelled_tabular_form_for(@group) do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<div><%= f.button l(:button_create), class: 'button -success -with-icon icon-yes' %></div> <div><%= f.button l(:button_create), class: 'button -highlight -with-icon icon-yes' %></div>
<% end %> <% end %>

2
app/views/help/wiki_syntax_detailed.html.erb
Unescape View File

@ -151,7 +151,7 @@ https://www.openproject.org, someone@foo.bar
</pre> </pre>
<p>displays: <a href="https://www.openproject.org" class="external">OpenProject web site</a></p> <p>displays: <a href="https://www.openproject.org" class="external">OpenProject web site</a></p>
<h2><a name="5" class="wiki-page"></a>Text formatting</h2> <h2><a name="5" class="wiki-page"></a>Text formatting</h2>
<p>For things such as headlines, bold, tables, lists, OpenProject supports Textile syntax. See <a class="external" href="http://www.textism.com/tools/textile/">http://www.textism.com/tools/textile/</a> for information on using any of these features. A few samples are included below, but the engine is capable of much more of that.</p> <p>For things such as headlines, bold, tables, lists, OpenProject supports Textile syntax. See <a class="external" href="http://txstyle.org/">http://txstyle.org/</a> for information on using any of these features. A few samples are included below, but the engine is capable of much more of that.</p>
<h3><a name="6" class="wiki-page"></a>Font style</h3> <h3><a name="6" class="wiki-page"></a>Font style</h3>
<pre> <pre>
* *bold* * *bold*

2
app/views/journals/_notes_form.html.erb
Unescape View File

@ -42,7 +42,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= call_hook(:view_journals_notes_form_after_notes, { :journal => @journal}) %> <%= call_hook(:view_journals_notes_form_after_notes, { :journal => @journal}) %>
<p> <p>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<%= link_to_remote l(:label_preview), <%= link_to_remote l(:label_preview),
{ :url => preview_journal_path(@journal), { :url => preview_journal_path(@journal),
:method => 'get', :method => 'get',

4
app/views/members/_member_form_impaired.html.erb
Unescape View File

@ -36,7 +36,7 @@ See doc/COPYRIGHT.rdoc for more details.
:html => {:id => "members_add_form"}) do |f| %> :html => {:id => "members_add_form"}) do |f| %>
<div class="form--section"> <div class="form--section">
<h3 class="form--section-title"><%= l(:label_member_new) %></h3> <h3 class="form--section-title"><%= l(:label_member_new) %></h3>
<div class="grid-block"> <div class="grid-block medium-up-2">
<div class="form--column"> <div class="form--column">
<div class="form--field"> <div class="form--field">
<%= styled_label_tag :principal_search, l(:label_principal_search) %> <%= styled_label_tag :principal_search, l(:label_principal_search) %>
@ -61,7 +61,7 @@ See doc/COPYRIGHT.rdoc for more details.
</div> </div>
<% if roles.any? && (principals.any? && principals.size <= 20) %> <% if roles.any? && (principals.any? && principals.size <= 20) %>
<%= f.button l(:button_add), :id => 'member-add-submit', <%= f.button l(:button_add), :id => 'member-add-submit',
class: 'button -success -with-icon icon-yes' %> class: 'button -highlight -with-icon icon-yes' %>
<% end %> <% end %>
</div> </div>

4
app/views/members/_member_form_non_impaired.html.erb
Unescape View File

@ -35,7 +35,7 @@ See doc/COPYRIGHT.rdoc for more details.
:html => {:id => "members_add_form"}) do |f| %> :html => {:id => "members_add_form"}) do |f| %>
<div class="form--section"> <div class="form--section">
<h3 class="form--section-title"><%= l(:label_member_new) %></h3> <h3 class="form--section-title"><%= l(:label_member_new) %></h3>
<div class="grid-block"> <div class="grid-block medium-up-2">
<div class="form--column"> <div class="form--column">
<div class="form--field -vertical"> <div class="form--field -vertical">
<%= styled_label_tag :member_user_ids, l(:label_principal_search) %> <%= styled_label_tag :member_user_ids, l(:label_principal_search) %>
@ -62,6 +62,6 @@ See doc/COPYRIGHT.rdoc for more details.
</div> </div>
</div> </div>
<%= f.button l(:button_add), :id => 'member-add-submit', <%= f.button l(:button_add), :id => 'member-add-submit',
class: 'button -success -with-icon icon-yes' %> class: 'button -highlight -with-icon icon-yes' %>
</div> </div>
<% end %> <% end %>

2
app/views/messages/edit.html.erb
Unescape View File

@ -39,7 +39,7 @@ See doc/COPYRIGHT.rdoc for more details.
<hr class="form--separator"> <hr class="form--separator">
<%= f.button l(:button_save), class: 'button -success -with-icon icon-yes' %> <%= f.button l(:button_save), class: 'button -highlight -with-icon icon-yes' %>
<%= preview_link preview_topic_path(@message), 'message-form-preview' %> <%= preview_link preview_topic_path(@message), 'message-form-preview' %>
<% end %> <% end %>
<div id="preview"></div> <div id="preview"></div>

2
app/views/messages/new.html.erb
Unescape View File

@ -38,7 +38,7 @@ See doc/COPYRIGHT.rdoc for more details.
<hr class="form--separator"> <hr class="form--separator">
<%= f.button l(:button_create), class: 'button -success -with-icon icon-yes' %> <%= f.button l(:button_create), class: 'button -highlight -with-icon icon-yes' %>
<%= preview_link preview_board_topics_path(@board), 'message-form-preview' %> <%= preview_link preview_board_topics_path(@board), 'message-form-preview' %>
<% end %> <% end %>

2
app/views/messages/show.html.erb
Unescape View File

@ -120,7 +120,7 @@ See doc/COPYRIGHT.rdoc for more details.
<hr class="form--separator"> <hr class="form--separator">
<%= f.button l(:button_submit), class: 'button -highlight -success -with-icon icon-yes' %> <%= f.button l(:button_submit), class: 'button -highlight -highlight -with-icon icon-yes' %>
<%= preview_link preview_topic_path(@message), 'message-form-preview' %> <%= preview_link preview_topic_path(@message), 'message-form-preview' %>
<% end %> <% end %>
<div id="preview"></div> <div id="preview"></div>

2
app/views/my/account.html.erb
Unescape View File

@ -75,5 +75,5 @@ See doc/COPYRIGHT.rdoc for more details.
</div> </div>
</div> </div>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/my/first_login.html.erb
Unescape View File

@ -36,5 +36,5 @@ See doc/COPYRIGHT.rdoc for more details.
<%= render :partial => "users/impaired_settings" %> <%= render :partial => "users/impaired_settings" %>
</section> </section>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

62
app/views/my/page.html.erb
Unescape View File

@ -27,37 +27,43 @@ See doc/COPYRIGHT.rdoc for more details.
++#%> ++#%>
<% breadcrumb_paths(l(:label_my_page)) %> <% breadcrumb_paths(l(:label_my_page)) %>
<% content_for :action_menu_specific do %> <% content_for :toolbar do %>
<%= link_to l(:label_personalize_page), { action: 'page_layout' }, accesskey: accesskey(:edit) %> <li class="toolbar-item">
<%= link_to({ action: 'page_layout' }, accesskey: accesskey(:edit), class: 'button') do %>
<i class="icon-edit"></i> <%= l(:label_personalize_page) %>
<% end %>
</li>
<% end %> <% end %>
<h2><%=l(:label_my_page)%></h2> <h2><%=l(:label_my_page)%></h2>
<%= render :partial => 'layouts/action_menu_specific' %> <%= render :partial => 'layouts/toolbar' %>
<div class="grid-block"> <div id="invisible-grid">
<div id="list-top" class="grid-content"> <div class="grid-block">
<% @blocks['top'].each do |b| <div id="list-top" class="grid-content">
next unless MyController.available_blocks.keys.include? b %> <% @blocks['top'].each do |b|
<div class="mypage-box"> next unless MyController.available_blocks.keys.include? b %>
<%= render :partial => "my/blocks/#{b}", :locals => { :user => @user } %> <div class="mypage-box">
</div> <%= render :partial => "my/blocks/#{b}", :locals => { :user => @user } %>
<% end if @blocks['top'] %> </div>
<% end if @blocks['top'] %>
</div>
</div> </div>
</div> <div class="grid-block">
<div class="grid-block"> <div id="list-left" class="grid-content">
<div id="list-left" class="grid-content"> <% @blocks['left'].each do |b|
<% @blocks['left'].each do |b| next unless MyController.available_blocks.keys.include? b %>
next unless MyController.available_blocks.keys.include? b %> <div class="mypage-box">
<div class="mypage-box"> <%= render :partial => "my/blocks/#{b}", :locals => { :user => @user } %>
<%= render :partial => "my/blocks/#{b}", :locals => { :user => @user } %> </div>
</div> <% end if @blocks['left'] %>
<% end if @blocks['left'] %> </div>
</div> <div id="list-right" class="grid-content">
<div id="list-right" class="grid-content"> <% @blocks['right'].each do |b|
<% @blocks['right'].each do |b| next unless MyController.available_blocks.keys.include? b %>
next unless MyController.available_blocks.keys.include? b %> <div class="mypage-box">
<div class="mypage-box"> <%= render :partial => "my/blocks/#{b}", :locals => { :user => @user } %>
<%= render :partial => "my/blocks/#{b}", :locals => { :user => @user } %> </div>
</div> <% end if @blocks['right'] %>
<% end if @blocks['right'] %> </div>
</div> </div>
</div> </div>
<% html_title(l(:label_my_page)) -%> <% html_title(l(:label_my_page)) -%>

84
app/views/my/page_layout.html.erb
Unescape View File

@ -64,54 +64,58 @@ See doc/COPYRIGHT.rdoc for more details.
} }
//]]> //]]>
</script> </script>
<% content_for :action_menu_specific do %>
<li> <% content_for :toolbar do %>
<%= form_tag({:action => "add_block"}, :id => "block-form") do %> <li class="toolbar-item">
<span class="legacy-actions--inline-label"> <%= styled_form_tag({:action => "add_block"}, :id => "block-form") do %>
<%= label_tag('block-select', "#{l(:label_my_page_block)}:", class: 'form-label -transparent') %> <%= styled_select_tag 'block', "<option>--#{t(:button_add)}--</option>".html_safe + options_for_select(@block_options),
<%= select_tag 'block', "<option></option>".html_safe + options_for_select(@block_options),
:id => "block-select", :id => "block-select",
class: 'form--select -small' %> class: '-small' %>
<span> <% end %>
<%= link_to_remote l(:button_add), </li>
{:url => { :action => "add_block" }, <li class="toolbar-item">
:with => "Form.serialize('block-form')", <%= link_to_remote l(:button_add),
:update => "list-top", {:url => { :action => "add_block" },
:position => :top, :with => "Form.serialize('block-form')",
:complete => "afterAddBlock();" :update => "list-top",
}, :class => 'icon icon-add' :position => :top,
%> :complete => "afterAddBlock();"
</span> }, :class => 'button'
</span> %>
</li>
<li class="toolbar-item">
<%= link_to({action: 'page'}, class: 'button') do %>
<i class="icon-cancel"></i> <%= l(:button_back) %>
<% end %> <% end %>
</li> </li>
<li><%= link_to l(:button_back), {:action => 'page'}, :class => 'icon icon-cancel' %></li>
<% end %> <% end %>
<h2><%=l(:label_my_page)%></h2> <h2><%=l(:label_my_page)%></h2>
<%= render :partial => 'layouts/action_menu_specific' %> <%= render :partial => 'layouts/toolbar' %>
<h4><%=l(:label_visible_elements) %></h4>
<div class="grid-block"> <div id="visible-grid">
<div id="list-top" class="grid-content block-receiver"> <div class="grid-block">
<% @blocks['top'].each do |b| <div id="list-top" class="grid-content block-receiver">
next unless MyController.available_blocks.keys.include? b %> <% @blocks['top'].each do |b|
<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %> next unless MyController.available_blocks.keys.include? b %>
<% end if @blocks['top'] %> <%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
</div> <% end if @blocks['top'] %>
</div> </div>
<div class="grid-block">
<div id="list-left" class="grid-content block-receiver">
<% @blocks['left'].each do |b|
next unless MyController.available_blocks.keys.include? b %>
<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
<% end if @blocks['left'] %>
</div> </div>
<div id="list-right" class="grid-content block-receiver"> <div class="grid-block">
<% @blocks['right'].each do |b| <div id="list-left" class="grid-content block-receiver">
next unless MyController.available_blocks.keys.include? b %> <% @blocks['left'].each do |b|
<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %> next unless MyController.available_blocks.keys.include? b %>
<% end if @blocks['right'] %> <%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
<% end if @blocks['left'] %>
</div>
<div id="list-right" class="grid-content block-receiver">
<% @blocks['right'].each do |b|
next unless MyController.available_blocks.keys.include? b %>
<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
<% end if @blocks['right'] %>
</div>
</div> </div>
</div> </div>
<%= sortable_element 'list-top', <%= sortable_element 'list-top',

2
app/views/news/edit.html.erb
Unescape View File

@ -34,7 +34,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= labelled_tabular_form_for @news, :html => { :id => 'news-form' } do |f| %> <%= labelled_tabular_form_for @news, :html => { :id => 'news-form' } do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<hr class="form--separator"> <hr class="form--separator">
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<%= preview_link preview_news_path(@news), 'news-form-preview' %> <%= preview_link preview_news_path(@news), 'news-form-preview' %>
<% end %> <% end %>
<div id="preview"></div> <div id="preview"></div>

2
app/views/news/new.html.erb
Unescape View File

@ -34,7 +34,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= labelled_tabular_form_for [@project, @news], :html => { :id => 'news-form' } do |f| %> <%= labelled_tabular_form_for [@project, @news], :html => { :id => 'news-form' } do |f| %>
<%= render :partial => 'news/form', :locals => { :f => f } %> <%= render :partial => 'news/form', :locals => { :f => f } %>
<hr class="form--separator"> <hr class="form--separator">
<%= styled_button_tag l(:button_create), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_create), class: '-highlight -with-icon icon-yes' %>
<%= preview_link preview_news_index_path, 'news-form-preview' %> <%= preview_link preview_news_index_path, 'news-form-preview' %>
<% end %> <% end %>
<div id="preview"></div> <div id="preview"></div>

2
app/views/news/show.html.erb
Unescape View File

@ -49,7 +49,7 @@ See doc/COPYRIGHT.rdoc for more details.
<div id="edit-news" style="display:none;"> <div id="edit-news" style="display:none;">
<%= labelled_tabular_form_for @news, :html => { :id => 'news-form' } do |f| %> <%= labelled_tabular_form_for @news, :html => { :id => 'news-form' } do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("edit-news"); return false;', <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("edit-news"); return false;',
class: 'button'%> class: 'button'%>
<%= preview_link preview_news_path(@news), 'news-form-preview' %> <%= preview_link preview_news_path(@news), 'news-form-preview' %>

2
app/views/planning_element_type_colors/_form.html.erb
Unescape View File

@ -43,5 +43,5 @@ See doc/COPYRIGHT.rdoc for more details.
</div> </div>
</fieldset> </fieldset>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<%= link_to l(:button_cancel), colors_path, class: 'button' %> <%= link_to l(:button_cancel), colors_path, class: 'button' %>

2
app/views/project_associations/edit.html.erb
Unescape View File

@ -46,7 +46,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= render :partial => 'form', :locals => {:f => f, :project => @project} %> <%= render :partial => 'form', :locals => {:f => f, :project => @project} %>
<%= f.button l(:button_update), :name => nil, class: 'button -success -with-icon icon-yes' %> <%= f.button l(:button_update), :name => nil, class: 'button -highlight -with-icon icon-yes' %>
<%= link_to l(:button_cancel), project_project_associations_path(@project), <%= link_to l(:button_cancel), project_project_associations_path(@project),
class: 'button'%> class: 'button'%>
<% end %> <% end %>

2
app/views/project_associations/new.html.erb
Unescape View File

@ -74,7 +74,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= render :partial => 'form', :locals => {:f => f, :project => @project} %> <%= render :partial => 'form', :locals => {:f => f, :project => @project} %>
<hr class="form--separator"> <hr class="form--separator">
<%= f.button l("timelines.add_project_association"), :name => nil, <%= f.button l("timelines.add_project_association"), :name => nil,
class: 'button -success -with-icon icon-yes'%> class: 'button -highlight -with-icon icon-yes'%>
<%= link_to l(:button_cancel), project_project_associations_path(@project), <%= link_to l(:button_cancel), project_project_associations_path(@project),
class: 'button'%> class: 'button'%>
<% end %> <% end %>

2
app/views/project_types/_form.html.erb
Unescape View File

@ -56,5 +56,5 @@ See doc/COPYRIGHT.rdoc for more details.
</p> </p>
</div> </div>
<%= f.button l(:button_save), class: 'button -success -with-icon icon-yes' %> <%= f.button l(:button_save), class: 'button -highlight -with-icon icon-yes' %>
<%= link_to l(:button_cancel), project_types_path, class: 'button' %> <%= link_to l(:button_cancel), project_types_path, class: 'button' %>

2
app/views/projects/_edit.html.erb
Unescape View File

@ -31,5 +31,5 @@ See doc/COPYRIGHT.rdoc for more details.
project: @project, project: @project,
renderTypes: false } %> renderTypes: false } %>
<%= f.button l(:button_save), class: 'button -success -with-icon icon-yes' %> <%= f.button l(:button_save), class: 'button -highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/projects/new.html.erb
Unescape View File

@ -30,6 +30,6 @@ See doc/COPYRIGHT.rdoc for more details.
<h2><%=l(:label_project_new)%></h2> <h2><%=l(:label_project_new)%></h2>
<%= labelled_tabular_form_for @project do |f| %> <%= labelled_tabular_form_for @project do |f| %>
<%= render :partial => 'form', :locals => { :f => f, :project => @project, :renderTypes => true } %> <%= render :partial => 'form', :locals => { :f => f, :project => @project, :renderTypes => true } %>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<%= javascript_tag "Form.Element.focus('project_name');" %> <%= javascript_tag "Form.Element.focus('project_name');" %>
<% end %> <% end %>

2
app/views/projects/settings/_activities.html.erb
Unescape View File

@ -65,5 +65,5 @@ See doc/COPYRIGHT.rdoc for more details.
:confirm => l(:text_are_you_sure), :confirm => l(:text_are_you_sure),
:class => 'icon icon-delete') %> :class => 'icon icon-delete') %>
</div> </div>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/projects/settings/_modules.html.erb
Unescape View File

@ -37,5 +37,5 @@ See doc/COPYRIGHT.rdoc for more details.
<%= render partial: "projects/form/modules", <%= render partial: "projects/form/modules",
locals: { form: form } %> locals: { form: form } %>
<p><%= form.button l(:button_save), class: 'button -success -with-icon icon-yes' %></p> <p><%= form.button l(:button_save), class: 'button -highlight -with-icon icon-yes' %></p>
<% end %> <% end %>

2
app/views/projects/settings/_repository.html.erb
Unescape View File

@ -60,5 +60,5 @@ See doc/COPYRIGHT.rdoc for more details.
<%= f.button((@repository.nil? || @repository.new_record?) ? l(:button_create) : l(:button_save), <%= f.button((@repository.nil? || @repository.new_record?) ? l(:button_create) : l(:button_save),
:disabled => @repository.nil?, :disabled => @repository.nil?,
class: 'button -success -with-icon icon-yes') %> class: 'button -highlight -with-icon icon-yes') %>
<% end %> <% end %>

2
app/views/projects/settings/_types.html.erb
Unescape View File

@ -36,7 +36,7 @@ See doc/COPYRIGHT.rdoc for more details.
:html => {:id => 'types-form'} do |f| %> :html => {:id => 'types-form'} do |f| %>
<%= render :partial => 'projects/form/types', :locals => { :f => f, :project => @project } %> <%= render :partial => 'projects/form/types', :locals => { :f => f, :project => @project } %>
<p><%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %></p> <p><%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %></p>
<% end %> <% end %>
<br/> <br/>

2
app/views/reportings/edit.html.erb
Unescape View File

@ -67,7 +67,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= wikitoolbar_for 'reporting_reported_project_status_comment' %> <%= wikitoolbar_for 'reporting_reported_project_status_comment' %>
</fieldset> </fieldset>
<hr class="form--separator"> <hr class="form--separator">
<%= f.button l(:button_save), :name => nil, class: 'button -success -with-icon icon-yes' %> <%= f.button l(:button_save), :name => nil, class: 'button -highlight -with-icon icon-yes' %>
<%= link_to l(:button_cancel), project_reportings_path(@project), class: 'button' %> <%= link_to l(:button_cancel), project_reportings_path(@project), class: 'button' %>
<% end %> <% end %>

2
app/views/reportings/new.html.erb
Unescape View File

@ -70,7 +70,7 @@ See doc/COPYRIGHT.rdoc for more details.
</fieldset> </fieldset>
<hr class="form--separator"> <hr class="form--separator">
<%= f.button l(:button_create), :name => nil, class: 'button -success -with-icon icon-yes' %> <%= f.button l(:button_create), :name => nil, class: 'button -highlight -with-icon icon-yes' %>
<%= link_to l(:button_cancel), project_reportings_path(@project), class: 'button' %> <%= link_to l(:button_cancel), project_reportings_path(@project), class: 'button' %>
<% end %> <% end %>

2
app/views/roles/edit.html.erb
Unescape View File

@ -33,5 +33,5 @@ See doc/COPYRIGHT.rdoc for more details.
<%= labelled_tabular_form_for @role, :html => { :id => 'role_form' }, :as => :role do |f| %> <%= labelled_tabular_form_for @role, :html => { :id => 'role_form' }, :as => :role do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/roles/new.html.erb
Unescape View File

@ -33,5 +33,5 @@ See doc/COPYRIGHT.rdoc for more details.
<%= labelled_tabular_form_for @role, :html => {:id => 'role_form'}, :as => :role do |f| %> <%= labelled_tabular_form_for @role, :html => {:id => 'role_form'}, :as => :role do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<%= styled_button_tag l(:button_create), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_create), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/roles/report.html.erb
Unescape View File

@ -77,5 +77,5 @@ See doc/COPYRIGHT.rdoc for more details.
</table> </table>
</div> </div>
<p><%= check_all_links 'permissions_form' %></p> <p><%= check_all_links 'permissions_form' %></p>
<p><%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %></p> <p><%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %></p>
<% end %> <% end %>

2
app/views/settings/_authentication.html.erb
Unescape View File

@ -105,5 +105,5 @@ See doc/COPYRIGHT.rdoc for more details.
<%= link_to l(:label_ldap_authentication), {:controller => '/ldap_auth_sources', :action => 'index'}, :class => 'icon icon-server-key' %> <%= link_to l(:label_ldap_authentication), {:controller => '/ldap_auth_sources', :action => 'index'}, :class => 'icon icon-server-key' %>
</div> </div>
<% end %> <% end %>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/settings/_display.html.erb
Unescape View File

@ -52,7 +52,7 @@ See doc/COPYRIGHT.rdoc for more details.
<div class="form--field"><%= setting_select :gravatar_default, [["Wavatars", 'wavatar'], ["Identicons", 'identicon'], ["Monster ids", 'monsterid'], ["Retro", 'retro'], ["Mystery man", 'mm']], :blank => :label_none %></div> <div class="form--field"><%= setting_select :gravatar_default, [["Wavatars", 'wavatar'], ["Identicons", 'identicon'], ["Monster ids", 'monsterid'], ["Retro", 'retro'], ["Mystery man", 'mm']], :blank => :label_none %></div>
</section> </section>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>
<div style="float:right"> <div style="float:right">

2
app/views/settings/_general.html.erb
Unescape View File

@ -64,5 +64,5 @@ See doc/COPYRIGHT.rdoc for more details.
<div class="form--field"><%= setting_text_field :diff_max_lines_displayed, :size => 6 %></div> <div class="form--field"><%= setting_text_field :diff_max_lines_displayed, :size => 6 %></div>
<%= call_hook(:view_settings_general_form) %> <%= call_hook(:view_settings_general_form) %>
</section> </section>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/settings/_mail_handler.html.erb
Unescape View File

@ -44,5 +44,5 @@ See doc/COPYRIGHT.rdoc for more details.
</span> </span>
</div> </div>
</section> </section>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/settings/_notifications.html.erb
Unescape View File

@ -76,7 +76,7 @@ See doc/COPYRIGHT.rdoc for more details.
<div style="float:right;"> <div style="float:right;">
<%= link_to l(:label_send_test_email), :controller => '/admin', :action => 'test_email' %> <%= link_to l(:label_send_test_email), :controller => '/admin', :action => 'test_email' %>
</div> </div>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>
<% else %> <% else %>
<div class="nodata"> <div class="nodata">

2
app/views/settings/_projects.html.erb
Unescape View File

@ -36,5 +36,5 @@ See doc/COPYRIGHT.rdoc for more details.
Role.find_all_givable.collect {|r| [r.name, r.id.to_s]}, Role.find_all_givable.collect {|r| [r.name, r.id.to_s]},
:blank => "--- #{l(:actionview_instancetag_blank_option)} ---" %></div> :blank => "--- #{l(:actionview_instancetag_blank_option)} ---" %></div>
</section> </section>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/settings/_repositories.html.erb
Unescape View File

@ -84,5 +84,5 @@ See doc/COPYRIGHT.rdoc for more details.
[[l(:label_default), 0]] + TimeEntryActivity.shared.all.collect{|activity| [activity.name, activity.id.to_s]}, [[l(:label_default), 0]] + TimeEntryActivity.shared.all.collect{|activity| [activity.name, activity.id.to_s]},
:disabled => !Setting.commit_logtime_enabled?%></div> :disabled => !Setting.commit_logtime_enabled?%></div>
</fieldset> </fieldset>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/settings/_users.html.erb
Unescape View File

@ -38,5 +38,5 @@ See doc/COPYRIGHT.rdoc for more details.
<%= setting_check_box :users_deletable_by_self %> <%= setting_check_box :users_deletable_by_self %>
</div> </div>
</div> </div>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/settings/_work_packages.html.erb
Unescape View File

@ -39,5 +39,5 @@ See doc/COPYRIGHT.rdoc for more details.
<%= settings_matrix([:work_package_list_default_columns, :work_package_list_summable_columns], <%= settings_matrix([:work_package_list_default_columns, :work_package_list_summable_columns],
Query.new.available_columns.collect {|c| [c.caption, c.name.to_s]}, :label_choices => :setting_work_package_properties) %> Query.new.available_columns.collect {|c| [c.caption, c.name.to_s]}, :label_choices => :setting_work_package_properties) %>
</fieldset> </fieldset>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/statuses/edit.html.erb
Unescape View File

@ -33,5 +33,5 @@ See doc/COPYRIGHT.rdoc for more details.
<%= labelled_tabular_form_for(@status) do |f| %> <%= labelled_tabular_form_for(@status) do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/statuses/new.html.erb
Unescape View File

@ -33,5 +33,5 @@ See doc/COPYRIGHT.rdoc for more details.
<%= labelled_tabular_form_for(@status) do |f| %> <%= labelled_tabular_form_for(@status) do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<%= styled_button_tag l(:button_create), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_create), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/timelines/edit.html.erb
Unescape View File

@ -38,7 +38,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= render(:partial => "timelines/form", <%= render(:partial => "timelines/form",
:locals => {:f => f, :timeline => @timeline}) %> :locals => {:f => f, :timeline => @timeline}) %>
<%= f.button l(:button_save), class: 'button -success -with-icon icon-yes' %> <%= f.button l(:button_save), class: 'button -highlight -with-icon icon-yes' %>
<%= link_to l(:button_cancel), project_timeline_path(@project, @timeline), class: 'button' %> <%= link_to l(:button_cancel), project_timeline_path(@project, @timeline), class: 'button' %>
<% end %> <% end %>

2
app/views/timelines/new.html.erb
Unescape View File

@ -38,7 +38,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= render(:partial => "timelines/form", <%= render(:partial => "timelines/form",
:locals => {:f => f, :timeline => @timeline}) %> :locals => {:f => f, :timeline => @timeline}) %>
<%= f.button l(:button_create), class: 'button -success -with-icon icon-yes' %> <%= f.button l(:button_create), class: 'button -highlight -with-icon icon-yes' %>
<%= link_to l(:button_cancel), project_path(@project), class: 'button' %> <%= link_to l(:button_cancel), project_path(@project), class: 'button' %>
<% end %> <% end %>

2
app/views/timelog/edit.html.erb
Unescape View File

@ -61,5 +61,5 @@ See doc/COPYRIGHT.rdoc for more details.
locals: { form: f } %> locals: { form: f } %>
<%= call_hook(:view_timelog_edit_form_bottom, { time_entry: @time_entry, form: f }) %> <%= call_hook(:view_timelog_edit_form_bottom, { time_entry: @time_entry, form: f }) %>
<%= f.button l(:button_save), class: 'button -success -with-icon icon-yes' %> <%= f.button l(:button_save), class: 'button -highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/types/_form.html.erb
Unescape View File

@ -62,7 +62,7 @@ See doc/COPYRIGHT.rdoc for more details.
<!--[eoform:type]--> <!--[eoform:type]-->
</section> </section>
<%= styled_button_tag l(controller.type.new_record? ? :button_create : :button_save), <%= styled_button_tag l(controller.type.new_record? ? :button_create : :button_save),
class: '-success -with-icon icon-yes' %> class: '-highlight -with-icon icon-yes' %>
</div> </div>
<div class="grid-content"> <div class="grid-content">
<% if @projects.any? %> <% if @projects.any? %>

2
app/views/users/_general.html.erb
Unescape View File

@ -60,5 +60,5 @@ See doc/COPYRIGHT.rdoc for more details.
</div> </div>
</div> </div>
<% end -%> <% end -%>
<div><%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %></div> <div><%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %></div>
<% end %> <% end %>

2
app/views/users/_groups.html.erb
Unescape View File

@ -36,5 +36,5 @@ See doc/COPYRIGHT.rdoc for more details.
<% end %> <% end %>
<%= hidden_field_tag 'user[group_ids][]', '' %> <%= hidden_field_tag 'user[group_ids][]', '' %>
</section> </section>
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/users/_memberships.html.erb
Unescape View File

@ -103,7 +103,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= labeled_check_box_tags 'membership[role_ids][]', roles %> <%= labeled_check_box_tags 'membership[role_ids][]', roles %>
</div> </div>
</div> </div>
<div><%= styled_button_tag l(:button_add), class: '-success -with-icon icon-yes' %></div> <div><%= styled_button_tag l(:button_add), class: '-highlight -with-icon icon-yes' %></div>
</fieldset> </fieldset>
<% end %> <% end %>
<% end %> <% end %>

4
app/views/users/new.html.erb
Unescape View File

@ -41,7 +41,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= l(:label_send_information) %></label> <%= l(:label_send_information) %></label>
</div> </div>
<p> <p>
<%= styled_button_tag l(:button_create), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_create), class: '-highlight -with-icon icon-yes' %>
<%= styled_button_tag l(:button_create_and_continue), :name => 'continue', class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_create_and_continue), :name => 'continue', class: '-highlight -with-icon icon-yes' %>
</p> </p>
<% end %> <% end %>

2
app/views/versions/edit.html.erb
Unescape View File

@ -36,6 +36,6 @@ See doc/COPYRIGHT.rdoc for more details.
project: @project } %> project: @project } %>
<hr class="form--separator"> <hr class="form--separator">
<%= styled_button_tag l(:button_save), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/versions/new.html.erb
Unescape View File

@ -36,6 +36,6 @@ See doc/COPYRIGHT.rdoc for more details.
project: @project } %> project: @project } %>
<hr class="form--separator"> <hr class="form--separator">
<%= styled_button_tag l(:button_create), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_create), class: '-highlight -with-icon icon-yes' %>
<% end %> <% end %>

2
app/views/watchers/_watchers.html.erb
Unescape View File

@ -60,7 +60,7 @@ See doc/COPYRIGHT.rdoc for more details.
</div> </div>
<div class="choice--button"> <div class="choice--button">
<%= styled_button_tag l(:button_add), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_add), class: '-highlight -with-icon icon-yes' %>
</div> </div>
<div class="choice--button"> <div class="choice--button">
<%= toggle_link l(:button_cancel), 'new-watcher-form', {}, class: 'button' %> <%= toggle_link l(:button_cancel), 'new-watcher-form', {}, class: 'button' %>

2
app/views/wiki/edit.html.erb
Unescape View File

@ -43,7 +43,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= render :partial => 'attachments/form' %> <%= render :partial => 'attachments/form' %>
<hr class="form--separator"> <hr class="form--separator">
<%= f.button l(:button_save), class: 'button -success -with-icon icon-yes' %> <%= f.button l(:button_save), class: 'button -highlight -with-icon icon-yes' %>
<%= preview_link preview_project_wiki_path(@project, @page), 'wiki_form-preview' %> <%= preview_link preview_project_wiki_path(@project, @page), 'wiki_form-preview' %>
<%= wikitoolbar_for 'content_text' %> <%= wikitoolbar_for 'content_text' %>
<% end %> <% end %>

2
app/views/wiki/new.html.erb
Unescape View File

@ -60,7 +60,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= render :partial => 'attachments/form', :f => f %> <%= render :partial => 'attachments/form', :f => f %>
<hr class="form--separator"> <hr class="form--separator">
<%= f.button l(:button_save), class: 'button -success -with-icon icon-yes' %> <%= f.button l(:button_save), class: 'button -highlight -with-icon icon-yes' %>
<%= preview_link preview_wiki_path(@project), 'wiki_form-preview' %> <%= preview_link preview_wiki_path(@project), 'wiki_form-preview' %>
<%= wikitoolbar_for 'content_text' %> <%= wikitoolbar_for 'content_text' %>

2
app/views/wiki_menu_items/edit.html.erb
Unescape View File

@ -71,7 +71,7 @@ See doc/COPYRIGHT.rdoc for more details.
</fieldset> </fieldset>
<p> <p>
<%= styled_button_tag l(:button_save), :method => :post, <%= styled_button_tag l(:button_save), :method => :post,
class: '-success -with-icon icon-yes' %> class: '-highlight -with-icon icon-yes' %>
<%= link_to l(:button_cancel), <%= link_to l(:button_cancel),
{:controller => '/wiki', :action => 'show', :project_id => @project, :id => @page_title}, {:controller => '/wiki', :action => 'show', :project_id => @project, :id => @page_title},
class: 'button'%> class: 'button'%>

2
app/views/work_package_relations/_form.html.erb
Unescape View File

@ -45,7 +45,7 @@ See doc/COPYRIGHT.rdoc for more details.
</span> </span>
</div> </div>
<div class="choice--button"> <div class="choice--button">
<%= styled_button_tag l(:button_add), class: '-success -with-icon icon-yes' %> <%= styled_button_tag l(:button_add), class: '-highlight -with-icon icon-yes' %>
</div> </div>
<div class="choice--button"> <div class="choice--button">
<%= toggle_link l(:button_cancel), 'new-relation-form', {}, class: 'button' %> <%= toggle_link l(:button_cancel), 'new-relation-form', {}, class: 'button' %>

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save