Skip to content
This repository has been archived by the owner on Jun 5, 2019. It is now read-only.

Commit

Permalink
Update stable/5 to v5.0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
oliverguenther committed Dec 11, 2015
2 parents 251e0a0 + 45dfd41 commit 8e94cba
Show file tree
Hide file tree
Showing 83 changed files with 1,002 additions and 536 deletions.
4 changes: 2 additions & 2 deletions Gemfile.lock
Expand Up @@ -45,10 +45,10 @@ GIT

GIT
remote: https://github.com/opf/openproject-translations.git
revision: e450671d8ee018c6df57c519cdafd5c7009e7e81
revision: 4b37594fa6053b1ccfd5b6edfe95e132c3588dfd
branch: release/5.0
specs:
openproject-translations (5.0.6)
openproject-translations (5.0.7)
crowdin-api (~> 0.4.0)
mixlib-shellout (~> 2.1.0)
rails (~> 4.2.3)
Expand Down
4 changes: 1 addition & 3 deletions app/assets/javascripts/jstoolbar/jstoolbar.js
Expand Up @@ -81,11 +81,9 @@ jsButton.prototype.draw = function() {

var button = document.createElement('button');
button.setAttribute('type','button');
button.setAttribute('aria-label', this.title);
if (this.className) button.className = this.className;
button.title = this.title;
var span = document.createElement('span');
span.appendChild(document.createTextNode(this.title));
button.appendChild(span);

if (this.icon != undefined) {
button.style.backgroundImage = 'url('+this.icon+')';
Expand Down
1 change: 1 addition & 0 deletions app/assets/stylesheets/_jstoolbar.sass
Expand Up @@ -90,6 +90,7 @@ $jstoolbar--icon-active-background: #eee
font-size: 0.8125rem
padding: 0.35rem
line-height: 1rem
@extend .icon-help1

&:before
color: $body-font-color
Expand Down
48 changes: 12 additions & 36 deletions app/assets/stylesheets/_misc_legacy.sass
Expand Up @@ -124,44 +124,23 @@ div
p
margin-top: 0
margin-bottom: 1em
&#activity dl
margin-left: 2em

#search-results
margin-left: 2em

div#activity dd, #search-results dd
margin-bottom: 1em
padding-left: 18px
font-size: 0.9em

div#activity
dt
&.me .time
border-bottom: 1px solid #999
.time
color: #777
font-size: 80%
dd .description
font-style: italic

#search-results dd .description
font-style: italic

div#activity span.project:after, #search-results span.project:after
content: " -"

div#activity dd span.description
display: block
color: #808080
#search-results
margin-left: 2em

#search-results dd
span.description
display: block
color: #808080
margin-bottom: 1em
padding-left: 20px
margin-left: 0
dd
margin-bottom: 1em
padding-left: 30px
margin-left: 0
font-size: 0.9em

span.description
display: block
color: #808080
font-style: italic

div#search-results-counts
float: right
Expand Down Expand Up @@ -325,9 +304,6 @@ input#user_search
&.attributes .label
font-weight: bold

#activity dt
clear: left

.journal-link
float: right

Expand Down
44 changes: 22 additions & 22 deletions app/assets/stylesheets/content/_attributes_group.lsg
Expand Up @@ -13,32 +13,32 @@
</div>
</div>

<dl class="attributes-key-value">
<dt class="attributes-key-value--key">Status</dt>
<dd class="attributes-key-value--value-container">
<div class="attributes-key-value">
<div class="attributes-key-value--key">Status</div>
<div class="attributes-key-value--value-container">
<div class="attributes-key-value--value -text">
<span title="New">New</span>
</div>
</dd>
<dt class="attributes-key-value--key">Percentage done</dt>
<dd class="attributes-key-value--value-container">
</div>
<div class="attributes-key-value--key">Percentage done</div>
<div class="attributes-key-value--value-container">
<div class="attributes-key-value--value -text">
<span title="0">0</span>
</div>
</dd>
<dt class="attributes-key-value--key">Date</dt>
<dd class="attributes-key-value--value-container">
</div>
<div class="attributes-key-value--key">Date</div>
<div class="attributes-key-value--value-container">
<div class="attributes-key-value--value -text">
<span title="">-</span>
</div>
</dd>
<dt class="attributes-key-value--key">Priority</dt>
<dd class="attributes-key-value--value-container">
</div>
<div class="attributes-key-value--key">Priority</div>
<div class="attributes-key-value--value-container">
<div class="attributes-key-value--value -text">
<span title="Normal">Normal</span>
</div>
</dd>
</dl>
</div>
</div>
</div>

<div class="attributes-group">
Expand All @@ -48,9 +48,9 @@
</div>
</div>

<dl class="attributes-key-value">
<dt class="attributes-key-value--key">Assignee</dt>
<dd class="attributes-key-value--value-container">
<div class="attributes-key-value">
<div class="attributes-key-value--key">Assignee</div>
<div class="attributes-key-value--value-container">
<div class="attributes-key-value--value -user">
<span class="user-avatar--container">
<img class="user-avatar--avatar" alt="Avatar" title="testing.long.emails@openproject.org" src="http://gravatar.com/avatar/ae4878114ca94594589106efaad8890e?default=wavatar&amp;secure=false">
Expand All @@ -61,9 +61,9 @@
</span>
</span>
</div>
</dd>
<dt class="attributes-key-value--key">Responsible</dt>
<dd class="attributes-key-value--value-container">
</div>
<div class="attributes-key-value--key">Responsible</div>
<div class="attributes-key-value--value-container">
<div class="attributes-key-value--value -user">
<span class="user-avatar--container">
<img class="user-avatar--avatar" alt="Avatar" title="testing.long.emails+filter-junk-away@openproject.org" src="http://gravatar.com/avatar/ae4878114ca94594589106efaad8890e?default=wavatar&amp;secure=false">
Expand All @@ -78,8 +78,8 @@
</span>
</span>
</div>
</dd>
</dl>
</div>
</div>
</div>
```

Expand Down
34 changes: 17 additions & 17 deletions app/assets/stylesheets/content/_attributes_key_value.lsg
@@ -1,37 +1,37 @@
# Attribute Lists (keys and values)

```
<dl class="attributes-key-value">
<dt class="attributes-key-value--key">Custom Float</dt>
<dd class="attributes-key-value--value-container">
<div class="attributes-key-value">
<div class="attributes-key-value--key">Custom Float</div>
<div class="attributes-key-value--value-container">
<div class="attributes-key-value--value -float">
<span title="12.00">12.00</span>
</div>
</dd>
<dt class="attributes-key-value--key">Custom Integer</dt>
<dd class="attributes-key-value--value-container">
</div>
<div class="attributes-key-value--key">Custom Integer</div>
<div class="attributes-key-value--value-container">
<div class="attributes-key-value--value -int">
<span title="69">69</span>
</div>
</dd>
<dt class="attributes-key-value--key">Custom Description</dt>
<dd class="attributes-key-value--value-container">
</div>
<div class="attributes-key-value--key">Custom Description</div>
<div class="attributes-key-value--value-container">
<div class="attributes-key-value--value -text">
<span title="Praesent id est eu velit molestie tincidunt. Quisque non dolor diam. Mauris vitae nunc felis. Integer vehicula molestie vehicula. Aliquam in magna eu lorem interdum tincidunt. Fusce egestas, enim vel luctus vulputate, augue tellus aliquam sem, tincidunt lacinia ante mauris at nisi. Vestibulum a magna et magna viverra efficitur. Vestibulum rhoncus ac ligula eget tristique. Vestibulum enim urna, varius eu turpis eget, pretium placerat neque. Vivamus et facilisis eros. Sed gravida lectus ac velit rutrum euismod. Etiam at ex condimentum, vestibulum elit non, aliquam ex.">
Praesent id est eu velit molestie tincidunt. Quisque non dolor diam. Mauris vitae nunc felis. Integer vehicula molestie vehicula. Aliquam in magna eu lorem interdum tincidunt. Fusce egestas, enim vel luctus vulputate, augue tellus aliquam sem, tincidunt lacinia ante mauris at nisi. Vestibulum a magna et magna viverra efficitur. Vestibulum rhoncus ac ligula eget tristique. Vestibulum enim urna, varius eu turpis eget, pretium placerat neque. Vivamus et facilisis eros. Sed gravida lectus ac velit rutrum euismod. Etiam at ex condimentum, vestibulum elit non, aliquam ex.
</span>
</div>
</dd>
<dt class="attributes-key-value--key">Custom Description with Long Label</dt>
<dd class="attributes-key-value--value-container">
</div>
<div class="attributes-key-value--key">Custom Description with Long Label</div>
<div class="attributes-key-value--value-container">
<div class="attributes-key-value--value -text">
<span title="Praesent id est eu velit molestie tincidunt. Quisque non dolor diam. Mauris vitae nunc felis. Integer vehicula molestie vehicula.">
Praesent id est eu velit molestie tincidunt. Quisque non dolor diam. Mauris vitae nunc felis. Integer vehicula molestie vehicula.
</span>
</div>
</dd>
<dt class="attributes-key-value--key">Custom User</dt>
<dd class="attributes-key-value--value-container">
</div>
<div class="attributes-key-value--key">Custom User</div>
<div class="attributes-key-value--value-container">
<div class="attributes-key-value--value -user">
<span class="user-avatar--container">
<img class="user-avatar--avatar" alt="Avatar" title="Max Mustermann" src="http://gravatar.com/avatar/ae4878114ca94594589106efaad8890e?default=wavatar&amp;secure=false">
Expand All @@ -45,6 +45,6 @@
</span>
</span>
</div>
</dd>
</dl>
</div>
</div>
```
31 changes: 16 additions & 15 deletions app/assets/stylesheets/content/_attributes_key_value.sass
Expand Up @@ -31,22 +31,23 @@
@include grid-layout(2)
@include grid-visible-overflow
font-size: 0.875rem
line-height: 1.6

.attributes-key-value--key
@extend .form--label
@include grid-size(4)
margin-bottom: 0.1875rem
padding: 0.375rem 0 0.375rem
font-weight: bold
.attributes-key-value--key
@extend .form--label
@include grid-size(4)
margin-bottom: 0.1875rem
padding: 0.375rem 0 !important
font-weight: bold

.attributes-key-value--value-container
@include grid-content(8)
@include grid-visible-overflow
margin-bottom: 0.1875rem
padding: 0
.attributes-key-value--value-container
@include grid-content(8)
@include grid-visible-overflow
margin-bottom: 0.1875rem
padding: 0 !important

&.not-editable
padding: 6px
&.not-editable
padding: 6px

.attributes-key-value--value
@include grid-visible-overflow
.attributes-key-value--value
@include grid-visible-overflow
22 changes: 11 additions & 11 deletions app/assets/stylesheets/content/_in_place_editing.lsg
Expand Up @@ -196,11 +196,11 @@
</h3>
</div>
</div>
<dl class="attributes-key-value">
<dt class="attributes-key-value--key">
<div class="attributes-key-value">
<div class="attributes-key-value--key">
Status
</dt>
<dd class="attributes-key-value--value-container">
</div>
<div class="attributes-key-value--value-container">
<div class="attributes-key-value--value -status">
<div class="inplace-edit type-select2 attribute-status.name">
<accessible-by-keyboard execute="startEditing()"
Expand Down Expand Up @@ -228,8 +228,8 @@
</accessible-by-keyboard>
</div>
</div>
</dd>
</dl>
</div>
</div>
</div>
```

Expand All @@ -246,9 +246,9 @@
</div>
</div>

<dl class="attributes-key-value">
<dt class="attributes-key-value--key ">Status</dt>
<dd class="attributes-key-value--value-container" >
<div class="attributes-key-value">
<div class="attributes-key-value--key ">Status</div>
<div class="attributes-key-value--value-container" >
<div class="attributes-key-value--value -status">
<div inplace-edit="">
<div class="inplace-edit type-select2 attribute-status.name" aria-busy="false" aria-disabled="false">
Expand Down Expand Up @@ -301,8 +301,8 @@
</div>
</div>
</div>
</dd>
</dl>
</div>
</div>
</div>

<div style="height: 50px;">
Expand Down
49 changes: 49 additions & 0 deletions app/assets/stylesheets/content/_list.lsg
@@ -0,0 +1,49 @@
# Generic lists

```
<ul class="generic-list">
<li class="work-package-edit">
<div class="title">
<span class="icon-context icon-work_package-edit"></span>
<span class="hidden-for-sighted">Edit work package</span>
<span class="time">16:00</span>
<a href="#">Phase #15: Go-Live (To be scheduled)</a>
</div>
<div class="description">Lorem ipsum</div>
<div class="author">
<img class="avatar-mini" src="/assets/default-avatar.png" />
Anonymus
</div>
</li>
<li class="news me">
<div class="title">
<span class="icon-context icon-news"></span>
<span class="hidden-for-sighted">News</span>
<span class="time">09:10</span>
<a href="#">Lorem ipsum dolor</a>
</div>
<div class="description"></div>
<div class="author">
<img src="http://gravatar.com/avatar/cb4f282fed12016bd18a879c1f27ff97" class="avatar-mini" />
<a href="#">Reinhold Weber</a>
</div>
</li>
<li class="message me">
<div class="title">
<span class="icon-context icon-message"></span>
<span class="hidden-for-sighted">Edit message</span>
<span class="time">20:24</span>
<a href="#">Demo Forum: RE: Hello world!</a>
</div>
<div class="description">
Reinhold Weber wrote:<br>
> Lorem ipsum dolor sit amet
</div>
<div class="author">
<img src="http://gravatar.com/avatar/cb4f282fed12016bd18a879c1f27ff97" class="avatar-mini" />
<a href="#">Reinhold Weber</a>
</div>
</li>
</ul>

```

0 comments on commit 8e94cba

Please sign in to comment.