taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #918 from taigaio/issue/186/import-errors-button 

Add buttons on lightboxes for import errors
stable
Juanfran 2016-03-18 11:58:40 +01:00
parent c16a6231e1 16b660c9c7
commit 8516da6c95
3 changed files with 95 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
app/partials/common/lightbox/lightbox-import-error.jade
View File

@ -1,44 +1,97 @@
a.close(href="", title="{{'COMMON.CLOSE' | translate}}")
a.close(
href=""
title="{{'COMMON.CLOSE' | translate}}"
)
svg.icon.icon-close
use(xlink:href="#icon-close")
.content
div(ng-switch="key")
div(ng-switch-when="private-space")
img(width="80", src="/#{v}/svg/icons/project-limit.svg")
.content(ng-switch="key")
.private-space(ng-switch-when="private-space")
img(
src="/#{v}/svg/icons/project-limit.svg"
)
h2.title(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_SPACE.TITLE", translate-values="{{values}}")
p(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_SPACE.DESC", translate-values="{{values}}")
h2.title(
translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_SPACE.TITLE"
translate-values="{{values}}"
)
p.description(
translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_SPACE.DESC"
translate-values="{{values}}"
)
div(ng-switch-when="private-members")
img(width="80", src="/#{v}/svg/icons/block-user.svg")
img(
src="/#{v}/svg/icons/block-user.svg"
)
h2.title(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_MEMBERS.TITLE", translate-values="{{values}}")
p(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PROJECT_MEMBERS_DESC", translate-values="{{values}}")
h2.title(
translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_MEMBERS.TITLE"
translate-values="{{values}}"
)
p.description(
translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PROJECT_MEMBERS_DESC"
translate-values="{{values}}"
)
div(ng-switch-when="private-space-members")
img(width="180", src="/#{v}/svg/icons/multi-block-project.svg")
img(
src="/#{v}/svg/icons/multi-block-project.svg"
)
h2.title(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_SPACE_MEMBERS.TITLE", translate-values="{{values}}")
p(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_SPACE_MEMBERS.DESC", translate-values="{{values}}")
h2.title(
translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_SPACE_MEMBERS.TITLE"
translate-values="{{values}}"
)
p.description(
translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PRIVATE_PROJECTS_SPACE_MEMBERS.DESC"
translate-values="{{values}}"
)
div(ng-switch-when="public-space")
img(width="80", src="/#{v}/svg/icons/project-limit.svg")
img(
src="/#{v}/svg/icons/project-limit.svg"
)
h2.title(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_SPACE.TITLE", translate-values="{{values}}")
p(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_SPACE.DESC", translate-values="{{values}}")
h2.title(
translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_SPACE.TITLE"
translate-values="{{values}}"
)
p.description(
translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_SPACE.DESC"
translate-values="{{values}}"
)
div(ng-switch-when="public-members")
img(width="80", src="/#{v}/svg/icons/block-user.svg")
img(
src="/#{v}/svg/icons/block-user.svg"
)
h2.title(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_MEMBERS.TITLE", translate-values="{{values}}")
p(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PROJECT_MEMBERS_DESC", translate-values="{{values}}")
h2.title(
translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_MEMBERS.TITLE"
translate-values="{{values}}"
)
p.description(
translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PROJECT_MEMBERS_DESC"
translate-values="{{values}}"
)
div(ng-switch-when="public-space-members")
img(width="180", src="/#{v}/svg/icons/multi-block-project.svg")
img(
src="/#{v}/svg/icons/multi-block-project.svg"
)
h2.title(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_SPACE_MEMBERS.TITLE", translate-values="{{values}}")
p(translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_SPACE_MEMBERS.DESC", translate-values="{{values}}")
h2.title(
translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_SPACE_MEMBERS.TITLE"
translate-values="{{values}}"
)
p.description(
translate="PROJECT.IMPORT.PROJECT_RESTRICTIONS.PUBLIC_PROJECTS_SPACE_MEMBERS.DESC"
translate-values="{{values}}"
)
div.options
a.button-green(translate="COMMON.ACCEPT", ng-click="close()")
a.button-green(
translate="COMMON.ACCEPT"
ng-click="close()"
)

13
app/styles/modules/common/lightbox.scss
View File

@ -537,15 +537,18 @@
.lightbox-import-error {
text-align: center;
p {
a {
color: $primary;
}
}
.content {
width: 500px;
}
h2 {
margin-top: 1rem;
}
.description {
a {
color: $primary;
}
}
img {
height: 5rem;
}
}

2
app/svg/icons/project-limit.svg
View File

@ -1,6 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 72.3 54.4">
<g fill="#b8b8b8" transform="translate(0 -8.944) scale(.07058)">
<path d="M607.8 126.7V229h-476v127.3H0v541h1024V126.7H671.8zm64 64H960v642.6H832V358.6h-.4v-2.3h-636V293l476.2 2.5z" />
<path d="M607.8 126.7V229h-476v127.3H0v541h1024V126.7H671.8zm64 64H960v642.6H832V358.6h-.4v-2.3h-636V293l476.2 2.5z"/>
</g>
<g fill="#f5f5f5" transform="translate(14.503 21.18) scale(.0254)">
<path d="M427.6 0c-149.5 0-271 121.6-271 271.4V391H0v633h1024V391H867.3V271.4C867.3 121.6 746 0 596.3 0H427.7zm0 64h168.8c115 0 206.8 92 206.8 207.4V391H220.7V271.5C220.7 156 312.4 64 427.7 64zM64 455.3h896V960H64V455zm416 131.5V816h64V586.7h-64z"/>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 595 B

After

Width:  |  Height:  |  Size: 616 B