Skip to content
Snippets Groups Projects
Commit 96dcb13f authored by Jeff Sturek's avatar Jeff Sturek
Browse files

Remove WDN references and other layout cleanup

parent d42217c2
No related branches found
No related tags found
1 merge request!17Remove WDN references and other layout cleanup
Show whitespace changes
Inline Side-by-side
Showing
with 185 additions and 159 deletions
composer.lock
+ 54
− 53
View file @ 96dcb13f
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "c3c7a8fc44c3bf68a94eb2d5dcbe7244", "content-hash": "2cf28c0ff1c77bb4defe29104a3e1654",
"packages": [ "packages": [
{ {
"name": "altorouter/altorouter", "name": "altorouter/altorouter",
...@@ -298,50 +298,6 @@ ...@@ -298,50 +298,6 @@
}, },
"time": "2019-12-10T10:24:42+00:00" "time": "2019-12-10T10:24:42+00:00"
}, },
{
"name": "php-activerecord/php-activerecord",
"version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/jpfuentes2/php-activerecord.git",
"reference": "e6d2dad090617336dee730190be0294c5f132c69"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/jpfuentes2/php-activerecord/zipball/e6d2dad090617336dee730190be0294c5f132c69",
"reference": "e6d2dad090617336dee730190be0294c5f132c69",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"require-dev": {
"pear/log": "~1.12",
"pear/pear_exception": "1.0-beta1",
"phpunit/phpunit": "4.*"
},
"type": "library",
"autoload": {
"files": [
"ActiveRecord.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "php-activerecord is an open source ORM library based on the ActiveRecord pattern.",
"homepage": "http://www.phpactiverecord.org/",
"keywords": [
"activerecord",
"orm"
],
"support": {
"issues": "https://github.com/jpfuentes2/php-activerecord/issues",
"source": "https://github.com/jpfuentes2/php-activerecord/tree/master"
},
"time": "2017-06-11T22:05:37+00:00"
},
{ {
"name": "phpmailer/phpmailer", "name": "phpmailer/phpmailer",
"version": "v5.2.27", "version": "v5.2.27",
...@@ -473,6 +429,50 @@ ...@@ -473,6 +429,50 @@
], ],
"time": "2015-01-17T07:51:57+00:00" "time": "2015-01-17T07:51:57+00:00"
}, },
{
"name": "unl/php-activerecord",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/unl/php-activerecord.git",
"reference": "7f5b9484ca093890186853ba435727909746540d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/unl/php-activerecord/zipball/7f5b9484ca093890186853ba435727909746540d",
"reference": "7f5b9484ca093890186853ba435727909746540d",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"require-dev": {
"pear/log": "~1.12",
"pear/pear_exception": "1.0-beta1",
"phpunit/phpunit": "4.*"
},
"default-branch": true,
"type": "library",
"autoload": {
"files": [
"ActiveRecord.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "Fork of php-activerecord/php-activerecord is an open source ORM library based on the ActiveRecord pattern.",
"homepage": "http://www.phpactiverecord.org/",
"keywords": [
"activerecord",
"orm"
],
"support": {
"source": "https://github.com/unl/php-activerecord/tree/master"
},
"time": "2021-12-21T20:24:37+00:00"
},
{ {
"name": "unl/php-dwt-parser", "name": "unl/php-dwt-parser",
"version": "v1.0.1", "version": "v1.0.1",
...@@ -526,16 +526,16 @@ ...@@ -526,16 +526,16 @@
}, },
{ {
"name": "unl/php-wdn-templates", "name": "unl/php-wdn-templates",
"version": "v5.3.0", "version": "v5.3.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/unl/phpunltemplates.git", "url": "https://github.com/unl/phpunltemplates.git",
"reference": "090d6c7c8ac8ab2828165bd06574ecb48caf1a88" "reference": "6e8d54a1405f69da508520c53dc059e66efa5ac1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/unl/phpunltemplates/zipball/090d6c7c8ac8ab2828165bd06574ecb48caf1a88", "url": "https://api.github.com/repos/unl/phpunltemplates/zipball/6e8d54a1405f69da508520c53dc059e66efa5ac1",
"reference": "090d6c7c8ac8ab2828165bd06574ecb48caf1a88", "reference": "6e8d54a1405f69da508520c53dc059e66efa5ac1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -581,9 +581,9 @@ ...@@ -581,9 +581,9 @@
"homepage": "http://wdn.unl.edu/", "homepage": "http://wdn.unl.edu/",
"support": { "support": {
"issues": "https://github.com/unl/phpunltemplates/issues", "issues": "https://github.com/unl/phpunltemplates/issues",
"source": "https://github.com/unl/phpunltemplates/tree/v5.3.0" "source": "https://github.com/unl/phpunltemplates/tree/v5.3.3"
}, },
"time": "2021-01-27T17:05:21+00:00" "time": "2021-03-29T21:02:08+00:00"
}, },
{ {
"name": "unl/unl_cache_lite", "name": "unl/unl_cache_lite",
...@@ -776,11 +776,12 @@ ...@@ -776,11 +776,12 @@
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": {
"jasig/phpcas": 20 "jasig/phpcas": 20,
"unl/php-activerecord": 20
}, },
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": [], "platform": [],
"platform-dev": [], "platform-dev": [],
"plugin-api-version": "2.0.0" "plugin-api-version": "2.1.0"
} }
less/main.less
+ 30
− 33
View file @ 96dcb13f
...@@ -117,13 +117,14 @@ img.height-40 { ...@@ -117,13 +117,14 @@ img.height-40 {
} }
svg.preview { svg.preview {
border: 2px dashed #DDDDDD; background-color: #FFF;
border: 2px dashed var(--b);
max-width: 100%; max-width: 100%;
/* disable for now, not displaying correctly in current 5.0 implementation */ /* disable for now, not displaying correctly in current 5.0 implementation */
/*max-height: 100%;*/ /*max-height: 100%;*/
} }
.wdn-hero { .lockup-hero {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
height: 25.24em; height: 25.24em;
...@@ -140,7 +141,7 @@ svg.preview { ...@@ -140,7 +141,7 @@ svg.preview {
} }
} }
.wdn-hero-text { .lockup-hero-text {
position: relative; position: relative;
bottom: auto; bottom: auto;
display: -webkit-flex; display: -webkit-flex;
...@@ -153,7 +154,7 @@ svg.preview { ...@@ -153,7 +154,7 @@ svg.preview {
text-align: center; text-align: center;
} }
.wdn-hero-heading { .lockup-hero-heading {
z-index: 1; z-index: 1;
margin: 0; margin: 0;
font-size: 2.67em; font-size: 2.67em;
...@@ -167,7 +168,7 @@ svg.preview { ...@@ -167,7 +168,7 @@ svg.preview {
} }
} }
.is-video.wdn-hero .wdn-hero-video { .is-video.lockup-hero .lockup-hero-video {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
...@@ -177,9 +178,9 @@ svg.preview { ...@@ -177,9 +178,9 @@ svg.preview {
> div { > div {
position: absolute; position: absolute;
display: none; display: none;
background-color: #fff; background-color: var(--bg-body);
color: #000; color: var(--body);
box-shadow: 0px 1px 4px RGBA(0,0,0,0.2); box-shadow: 0px 1px 4px var(--b);
padding: .75em; padding: .75em;
bottom: 160%; bottom: 160%;
left: -91px; left: -91px;
...@@ -189,7 +190,7 @@ svg.preview { ...@@ -189,7 +190,7 @@ svg.preview {
} }
> div:before { > div:before {
background-color: white; background-color: var(--bg-body);
content: ""; content: "";
display: block; display: block;
width: 15px; width: 15px;
...@@ -210,7 +211,7 @@ svg.preview { ...@@ -210,7 +211,7 @@ svg.preview {
content:""; content:"";
height: 12px; height: 12px;
width: 40px; width: 40px;
background-color: #fff; background-color: var(--bg-body);
display: block; display: block;
position: absolute; position: absolute;
bottom: 0px; bottom: 0px;
...@@ -246,18 +247,14 @@ svg.preview { ...@@ -246,18 +247,14 @@ svg.preview {
margin-left: -24px; margin-left: -24px;
} }
background-color: #1B9AE8; background-color: var(--bg-body);
border-radius: 2em; color: #1B9AE8;
height: 1.5em;
width: 1.5em;
padding: 0 0.2em;
color: #fff;
display: inline-block; display: inline-block;
text-align: center; text-align: center;
font-size: 0.85em;
line-height: 1.6em;
position: relative; position: relative;
line-height: 1.6em;
font-size: .8125rem; font-size: .8125rem;
ul li { ul li {
margin-bottom: .75em; margin-bottom: .75em;
} }
...@@ -281,17 +278,17 @@ svg.preview { ...@@ -281,17 +278,17 @@ svg.preview {
} }
.toolbox, .visual-island { .toolbox, .visual-island {
background: #f9f8f5; background: var(--bg-dialog);
margin-bottom: 1em; margin-bottom: 1em;
word-wrap: break-word; word-wrap: break-word;
padding: 0 !important; padding: 0 !important;
.tools, .details { .tools, .details {
padding: 1em; padding: 1em;
border-left: 1px solid #d5d5d2; border-left: 1px solid var(--b);
border-right: 1px solid #d5d5d2; border-right: 1px solid var(--b);
border-bottom: 1px solid #d5d5d2; border-bottom: 1px solid var(--b);
&.top-border { &.top-border {
border-top: 1px solid #d5d5d2; border-top: 1px solid var(--b);
} }
} }
...@@ -299,13 +296,13 @@ svg.preview { ...@@ -299,13 +296,13 @@ svg.preview {
display: block; display: block;
font-size: .802em !important; font-size: .802em !important;
margin: 0; margin: 0;
border-bottom: 1px solid #474746; border-bottom: 1px solid var(--heading);
font-family: "Gotham SSm A","Gotham SSm B",Verdana,"Verdana Ref",Geneva,Tahoma,"Lucida Grande","Lucida Sans Unicode","Lucida Sans","DejaVu Sans","Bitstream Vera Sans","Liberation Sans",sans-serif; font-family: "Gotham SSm A","Gotham SSm B",Verdana,"Verdana Ref",Geneva,Tahoma,"Lucida Grande","Lucida Sans Unicode","Lucida Sans","DejaVu Sans","Bitstream Vera Sans","Liberation Sans",sans-serif;
width: 100%; width: 100%;
background-color: #474746; background-color: var(--heading);
padding: 1em; padding: 1em;
text-transform: uppercase; text-transform: uppercase;
color:#fff; color: var(--inverse);
font-weight: 400; font-weight: 400;
font-style: normal; font-style: normal;
text-align: center; text-align: center;
...@@ -327,7 +324,7 @@ svg.preview { ...@@ -327,7 +324,7 @@ svg.preview {
} }
@media (min-width: 0px) { @media (min-width: 0px) {
.wdn-hero { .lockup-hero {
height: 5em; height: 5em;
height: 10vh; height: 10vh;
max-height: 8em; max-height: 8em;
...@@ -335,7 +332,7 @@ svg.preview { ...@@ -335,7 +332,7 @@ svg.preview {
} }
@media (min-height: 480px) and (min-width: 480px) { @media (min-height: 480px) and (min-width: 480px) {
.wdn-hero { .lockup-hero {
height: 15em; height: 15em;
height: 30vh; height: 30vh;
max-height: 22em; max-height: 22em;
...@@ -343,7 +340,7 @@ svg.preview { ...@@ -343,7 +340,7 @@ svg.preview {
} }
@media (min-height: 718px) and (min-width: 960px) { @media (min-height: 718px) and (min-width: 960px) {
.wdn-hero { .lockup-hero {
height: 25.24em; height: 25.24em;
height: 56vh; height: 56vh;
max-height: 31.474em; max-height: 31.474em;
...@@ -351,7 +348,7 @@ svg.preview { ...@@ -351,7 +348,7 @@ svg.preview {
} }
@media (min-height: 895px) and (min-width: 1044px) { @media (min-height: 895px) and (min-width: 1044px) {
.wdn-hero { .lockup-hero {
height: 31.474em; height: 31.474em;
height: 75vh; height: 75vh;
max-height: 33.645em; max-height: 33.645em;
...@@ -360,17 +357,17 @@ svg.preview { ...@@ -360,17 +357,17 @@ svg.preview {
@media (min-width: 480px) { @media (min-width: 480px) {
.wdn-hero-heading { .lockup-hero-heading {
font-size: 3.16em; font-size: 3.16em;
} }
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.wdn-hero-heading { .lockup-hero-heading {
font-size: 4.21em; font-size: 4.21em;
} }
} }
@media (min-width: 1044px) { @media (min-width: 1044px) {
.wdn-hero-heading { .lockup-hero-heading {
font-size: 4.74em; font-size: 4.74em;
} }
} }
......
public/css/main.css
+ 1
− 1
View file @ 96dcb13f
.dcf-nav-menu-child ul{list-style:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg'/%3E");margin-bottom:0;padding-left:0}a{text-decoration:none}label>input{visibility:hidden;position:absolute}label img{padding:5px}label>input+img,label>input+img+img{cursor:pointer;-webkit-box-shadow:0 0 8px #DDD;box-shadow:0 0 8px #DDD}label>input:checked+img,label>input:checked+img+img{-webkit-box-shadow:0 0 8px #1B9AE8;box-shadow:0 0 8px #1B9AE8}form legend{font-size:1.5em}textarea{resize:vertical}.page-title{margin-top:0}div.left,section.left,td.left,th.left{text-align:left}div.center,label.center,section.center,td.center,th.center{text-align:center}div.right,section.right,td.right,th.right{text-align:right}img.height-36{max-height:108px}img.height-38{max-height:114px}img.height-40{max-height:120px}.approval-bug{text-align:center;background:#1b9ae8;border:1px solid #137cbd;border-radius:1em;padding:1em;color:#fefdfa;font-family:"Gotham SSm A","Gotham SSm B",Verdana,"Verdana Ref",Geneva,Tahoma,"Lucida Grande","Lucida Sans Unicode","Lucida Sans","DejaVu Sans","Bitstream Vera Sans","Liberation Sans",sans-serif;font-weight:400;font-style:normal}.approval-bug.approved{background:#00bc3c;border:1px solid #00892c}.approval-bug.denied{background:#ff5151;border:1px solid #d00000}.caps{text-transform:uppercase;color:inherit}.featured-icon{background-color:#00BD3C;height:144px;width:144px;border-radius:80px;float:none!important;margin:0 auto!important}.featured-icon.red{background-color:#D00000}.featured-icon.blue{background-color:#1B9AE8}.table-actions{line-height:1}.table-actions a,.table-actions button{vertical-align:middle}.delete-form{display:inline;padding:0}svg.preview{border:2px dashed #DDD;max-width:100%}.wdn-hero{position:relative;overflow:hidden;height:25.24em;height:42vh;background-color:#000;display:-ms-flexbox;display:-webkit-box;display:flex;-ms-flex-align:center;-webkit-box-align:center;align-items:center}.wdn-hero video{width:100%}.wdn-hero-text{position:relative;bottom:auto;display:-ms-flexbox;display:-webkit-box;display:flex;-ms-flex-direction:column;-webkit-box-orient:vertical;-webkit-box-direction:normal;flex-direction:column;width:100%;text-align:center}.wdn-hero-heading{z-index:1;margin:0;font-size:2.67em;text-transform:uppercase;color:#fff}.wdn-hero-heading .hero-line{display:inline-block;line-height:1;border-top:1px solid rgba(255,255,255,.2);border-bottom:1px solid rgba(255,255,255,.2)}.is-video.wdn-hero .wdn-hero-video{position:absolute;top:0;left:0}.tooltip{background-color:#1B9AE8;border-radius:2em;height:1.5em;width:1.5em;padding:0 .2em;color:#fff;display:inline-block;text-align:center;font-size:.85em;line-height:1.6em;position:relative;font-size:.8125rem}.tooltip>div{position:absolute;display:none;background-color:#fff;color:#000;-webkit-box-shadow:0 1px 4px rgba(0,0,0,.2);box-shadow:0 1px 4px rgba(0,0,0,.2);padding:.75em;bottom:160%;left:-91px;width:200px;text-align:left;z-index:250}.tooltip>div:before{background-color:#fff;content:"";display:block;width:15px;height:15px;position:absolute;bottom:-8px;left:50%;margin-left:-7px;transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg);-moz-transform:rotate(45deg);-webkit-transform:rotate(45deg);-webkit-box-shadow:0 0 4px rgba(0,0,0,.25);box-shadow:0 0 4px rgba(0,0,0,.25)}.tooltip>div:after{content:"";height:12px;width:40px;background-color:#fff;display:block;position:absolute;bottom:0;left:50%;margin-left:-24px}.tooltip.hang-right>div{left:-27px}.tooltip.hang-left>div{left:-157px}.tooltip.hang-right>div:before{left:34px;margin-left:-7px}.tooltip.hang-right>div:after{left:34px;margin-left:-24px}.tooltip.hang-left>div:before{left:166px;margin-left:-7px}.tooltip.hang-left>div:after{left:166px;margin-left:-24px}.tooltip ul li{margin-bottom:.75em}.tooltip span.heading{font-family:"Tungsten A","Tungsten B",HelveticaNeueCondensed,HelveticaNeue-Condensed,"Helvetica Neue Condensed",HelveticaNeueRomanCondensed,HelveticaNeue-Roman-Condensed,"Helvetica Neue Roman Condensed","Arial Narrow",HelveticaNeue,"Helvetica Neue",HelveticaNeueRoman,HelveticaNeue-Roman,"Helvetica Neue Roman",Helvetica,Tahoma,Geneva,Arial,sans-serif;font-size:1.777em}.tooltip:hover>div{display:block}.tooltip p{margin:0}.tooltip.italic *{font-style:italic}.toolbox,.visual-island{background:#f9f8f5;margin-bottom:1em;word-wrap:break-word;padding:0!important}.toolbox .details,.toolbox .tools,.visual-island .details,.visual-island .tools{padding:1em;border-left:1px solid #d5d5d2;border-right:1px solid #d5d5d2;border-bottom:1px solid #d5d5d2}.toolbox .details.top-border,.toolbox .tools.top-border,.visual-island .details.top-border,.visual-island .tools.top-border{border-top:1px solid #d5d5d2}.toolbox .vi-header,.toolbox h1,.toolbox h2,.toolbox h3,.toolbox h4,.toolbox h5,.toolbox h6,.visual-island .vi-header,.visual-island h1,.visual-island h2,.visual-island h3,.visual-island h4,.visual-island h5,.visual-island h6{display:block;font-size:.802em!important;margin:0;border-bottom:1px solid #474746;font-family:"Gotham SSm A","Gotham SSm B",Verdana,"Verdana Ref",Geneva,Tahoma,"Lucida Grande","Lucida Sans Unicode","Lucida Sans","DejaVu Sans","Bitstream Vera Sans","Liberation Sans",sans-serif;width:100%;background-color:#474746;padding:1em;text-transform:uppercase;color:#fff;font-weight:400;font-style:normal;text-align:center}.toolbox p,.visual-island p{padding:0 1em 1em 1em}.toolbox ul,.visual-island ul{padding:0;padding-left:1em;margin:0}.toolbox ul a,.visual-island ul a{border-bottom:none;font-family:"Gotham SSm A","Gotham SSm B",Verdana,"Verdana Ref",Geneva,Tahoma,"Lucida Grande","Lucida Sans Unicode","Lucida Sans","DejaVu Sans","Bitstream Vera Sans","Liberation Sans",sans-serif}@media (min-width:0px){.wdn-hero{height:5em;height:10vh;max-height:8em}}@media (min-height:480px) and (min-width:480px){.wdn-hero{height:15em;height:30vh;max-height:22em}}@media (min-height:718px) and (min-width:960px){.wdn-hero{height:25.24em;height:56vh;max-height:31.474em}}@media (min-height:895px) and (min-width:1044px){.wdn-hero{height:31.474em;height:75vh;max-height:33.645em}}@media (min-width:480px){.wdn-hero-heading{font-size:3.16em}}@media (min-width:768px){.wdn-hero-heading{font-size:4.21em}}@media (min-width:1044px){.wdn-hero-heading{font-size:4.74em}} .dcf-nav-menu-child ul{list-style:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg'/%3E");margin-bottom:0;padding-left:0}a{text-decoration:none}label>input{visibility:hidden;position:absolute}label img{padding:5px}label>input+img,label>input+img+img{cursor:pointer;-webkit-box-shadow:0 0 8px #DDD;box-shadow:0 0 8px #DDD}label>input:checked+img,label>input:checked+img+img{-webkit-box-shadow:0 0 8px #1B9AE8;box-shadow:0 0 8px #1B9AE8}form legend{font-size:1.5em}textarea{resize:vertical}.page-title{margin-top:0}div.left,section.left,td.left,th.left{text-align:left}div.center,label.center,section.center,td.center,th.center{text-align:center}div.right,section.right,td.right,th.right{text-align:right}img.height-36{max-height:108px}img.height-38{max-height:114px}img.height-40{max-height:120px}.approval-bug{text-align:center;background:#1b9ae8;border:1px solid #137cbd;border-radius:1em;padding:1em;color:#fefdfa;font-family:"Gotham SSm A","Gotham SSm B",Verdana,"Verdana Ref",Geneva,Tahoma,"Lucida Grande","Lucida Sans Unicode","Lucida Sans","DejaVu Sans","Bitstream Vera Sans","Liberation Sans",sans-serif;font-weight:400;font-style:normal}.approval-bug.approved{background:#00bc3c;border:1px solid #00892c}.approval-bug.denied{background:#ff5151;border:1px solid #d00000}.caps{text-transform:uppercase;color:inherit}.featured-icon{background-color:#00BD3C;height:144px;width:144px;border-radius:80px;float:none!important;margin:0 auto!important}.featured-icon.red{background-color:#D00000}.featured-icon.blue{background-color:#1B9AE8}.table-actions{line-height:1}.table-actions a,.table-actions button{vertical-align:middle}.delete-form{display:inline;padding:0}svg.preview{background-color:#FFF;border:2px dashed var(--b);max-width:100%}.lockup-hero{position:relative;overflow:hidden;height:25.24em;height:42vh;background-color:#000;display:-ms-flexbox;display:-webkit-box;display:flex;-ms-flex-align:center;-webkit-box-align:center;align-items:center}.lockup-hero video{width:100%}.lockup-hero-text{position:relative;bottom:auto;display:-ms-flexbox;display:-webkit-box;display:flex;-ms-flex-direction:column;-webkit-box-orient:vertical;-webkit-box-direction:normal;flex-direction:column;width:100%;text-align:center}.lockup-hero-heading{z-index:1;margin:0;font-size:2.67em;text-transform:uppercase;color:#fff}.lockup-hero-heading .hero-line{display:inline-block;line-height:1;border-top:1px solid rgba(255,255,255,.2);border-bottom:1px solid rgba(255,255,255,.2)}.is-video.lockup-hero .lockup-hero-video{position:absolute;top:0;left:0}.tooltip{background-color:var(--bg-body);color:#1B9AE8;display:inline-block;text-align:center;position:relative;line-height:1.6em;font-size:.8125rem}.tooltip>div{position:absolute;display:none;background-color:var(--bg-body);color:var(--body);-webkit-box-shadow:0 1px 4px var(--b);box-shadow:0 1px 4px var(--b);padding:.75em;bottom:160%;left:-91px;width:200px;text-align:left;z-index:250}.tooltip>div:before{background-color:var(--bg-body);content:"";display:block;width:15px;height:15px;position:absolute;bottom:-8px;left:50%;margin-left:-7px;transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg);-moz-transform:rotate(45deg);-webkit-transform:rotate(45deg);-webkit-box-shadow:0 0 4px rgba(0,0,0,.25);box-shadow:0 0 4px rgba(0,0,0,.25)}.tooltip>div:after{content:"";height:12px;width:40px;background-color:var(--bg-body);display:block;position:absolute;bottom:0;left:50%;margin-left:-24px}.tooltip.hang-right>div{left:-27px}.tooltip.hang-left>div{left:-157px}.tooltip.hang-right>div:before{left:34px;margin-left:-7px}.tooltip.hang-right>div:after{left:34px;margin-left:-24px}.tooltip.hang-left>div:before{left:166px;margin-left:-7px}.tooltip.hang-left>div:after{left:166px;margin-left:-24px}.tooltip ul li{margin-bottom:.75em}.tooltip span.heading{font-family:"Tungsten A","Tungsten B",HelveticaNeueCondensed,HelveticaNeue-Condensed,"Helvetica Neue Condensed",HelveticaNeueRomanCondensed,HelveticaNeue-Roman-Condensed,"Helvetica Neue Roman Condensed","Arial Narrow",HelveticaNeue,"Helvetica Neue",HelveticaNeueRoman,HelveticaNeue-Roman,"Helvetica Neue Roman",Helvetica,Tahoma,Geneva,Arial,sans-serif;font-size:1.777em}.tooltip:hover>div{display:block}.tooltip p{margin:0}.tooltip.italic *{font-style:italic}.toolbox,.visual-island{background:var(--bg-dialog);margin-bottom:1em;word-wrap:break-word;padding:0!important}.toolbox .details,.toolbox .tools,.visual-island .details,.visual-island .tools{padding:1em;border-left:1px solid var(--b);border-right:1px solid var(--b);border-bottom:1px solid var(--b)}.toolbox .details.top-border,.toolbox .tools.top-border,.visual-island .details.top-border,.visual-island .tools.top-border{border-top:1px solid var(--b)}.toolbox .vi-header,.toolbox h1,.toolbox h2,.toolbox h3,.toolbox h4,.toolbox h5,.toolbox h6,.visual-island .vi-header,.visual-island h1,.visual-island h2,.visual-island h3,.visual-island h4,.visual-island h5,.visual-island h6{display:block;font-size:.802em!important;margin:0;border-bottom:1px solid var(--heading);font-family:"Gotham SSm A","Gotham SSm B",Verdana,"Verdana Ref",Geneva,Tahoma,"Lucida Grande","Lucida Sans Unicode","Lucida Sans","DejaVu Sans","Bitstream Vera Sans","Liberation Sans",sans-serif;width:100%;background-color:var(--heading);padding:1em;text-transform:uppercase;color:var(--inverse);font-weight:400;font-style:normal;text-align:center}.toolbox p,.visual-island p{padding:0 1em 1em 1em}.toolbox ul,.visual-island ul{padding:0;padding-left:1em;margin:0}.toolbox ul a,.visual-island ul a{border-bottom:none;font-family:"Gotham SSm A","Gotham SSm B",Verdana,"Verdana Ref",Geneva,Tahoma,"Lucida Grande","Lucida Sans Unicode","Lucida Sans","DejaVu Sans","Bitstream Vera Sans","Liberation Sans",sans-serif}@media (min-width:0px){.lockup-hero{height:5em;height:10vh;max-height:8em}}@media (min-height:480px) and (min-width:480px){.lockup-hero{height:15em;height:30vh;max-height:22em}}@media (min-height:718px) and (min-width:960px){.lockup-hero{height:25.24em;height:56vh;max-height:31.474em}}@media (min-height:895px) and (min-width:1044px){.lockup-hero{height:31.474em;height:75vh;max-height:33.645em}}@media (min-width:480px){.lockup-hero-heading{font-size:3.16em}}@media (min-width:768px){.lockup-hero-heading{font-size:4.21em}}@media (min-width:1044px){.lockup-hero-heading{font-size:4.74em}}
\ No newline at end of file \ No newline at end of file
src/Controllers/LockupsController.php
+ 14
− 4
View file @ 96dcb13f
...@@ -147,7 +147,12 @@ class LockupsController extends Controller { ...@@ -147,7 +147,12 @@ class LockupsController extends Controller {
\Core::redirect('/lockups/create/'); \Core::redirect('/lockups/create/');
} }
try {
$model->save(); $model->save();
} catch (\Exception $e) {
self::flashNotice(parent::NOTICE_LEVEL_ERROR, 'Error', 'The lockup failed to create.');
\Core::redirect('/lockups/create/');
}
\Core::redirect($model->getPreviewURL()); \Core::redirect($model->getPreviewURL());
} }
...@@ -322,7 +327,12 @@ class LockupsController extends Controller { ...@@ -322,7 +327,12 @@ class LockupsController extends Controller {
\Core::redirect($lockup_model->getEditURL()); \Core::redirect($lockup_model->getEditURL());
} }
try {
$lockup_model->save(); $lockup_model->save();
} catch (\Exception $e) {
self::flashNotice(parent::NOTICE_LEVEL_ERROR, 'Error', 'The lockup failed to update.');
\Core::redirect($lockup_model->getEditURL());
}
\Core::redirect($lockup_model->getPreviewURL()); \Core::redirect($lockup_model->getPreviewURL());
} }
...@@ -541,7 +551,7 @@ UNL Lockup Factory'; ...@@ -541,7 +551,7 @@ UNL Lockup Factory';
} }
$frontend_output = $lockup_model->createAllVersions(); $frontend_output = $lockup_model->createAllVersions();
self::storeGenerateOutput(join($frontend_output, '
 
')); self::storeGenerateOutput(join('
 
', $frontend_output));
$lockup_model->status = Lockup::GENERATED; $lockup_model->status = Lockup::GENERATED;
$lockup_model->creative_status = Lockup::GENERATED; $lockup_model->creative_status = Lockup::GENERATED;
...@@ -579,7 +589,7 @@ UNL Lockup Factory'; ...@@ -579,7 +589,7 @@ UNL Lockup Factory';
# then run the generate functionality again # then run the generate functionality again
$frontend_output = $lockup_model->createAllVersions(); $frontend_output = $lockup_model->createAllVersions();
self::storeGenerateOutput(join($frontend_output, '
 
')); self::storeGenerateOutput(join('
 
', $frontend_output));
$lockup_model->version = self::LOCKUP_VERSION; $lockup_model->version = self::LOCKUP_VERSION;
$lockup_model->save(); $lockup_model->save();
......
src/Models/Lockup.php
+ 12
− 7
View file @ 96dcb13f
...@@ -363,13 +363,18 @@ class Lockup extends \ActiveRecord\Model { ...@@ -363,13 +363,18 @@ class Lockup extends \ActiveRecord\Model {
} }
# cleanup these files # cleanup these files
unlink($new_jpg); $this->removeFile($new_jpg);
unlink($new_pdf); $this->removeFile($new_pdf);
unlink($new_png); $this->removeFile($new_png);
unlink($new_eps); $this->removeFile($new_eps);
unlink($new_svg); $this->removeFile($new_svg);
return $frontend_output; return $frontend_output;
} }
private function removeFile($file) {
if (file_exists($file)) {
unlink($file);
}
}
} }
src/Views/download_lockup_files.php
+ 3
− 3
View file @ 96dcb13f
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<img src="<?php echo $context->lockup->getPNGDownloadURL() ?>" role="presentation"> <img src="<?php echo $context->lockup->getPNGDownloadURL() ?>" role="presentation">
</div> </div>
<br> <br>
<table> <table class="dcf-table dcf-table-bordered">
<thead> <thead>
<tr> <tr>
<th>Download Entire Package as ZIP</th> <th>Download Entire Package as ZIP</th>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</tbody> </tbody>
</table> </table>
<br> <br>
<table> <table class="dcf-table dcf-table-bordered">
<thead> <thead>
<tr> <tr>
<th><strong>Please Read!</strong> Instructions for Pantone Lockups</th> <th><strong>Please Read!</strong> Instructions for Pantone Lockups</th>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</tbody> </tbody>
</table> </table>
<br> <br>
<table> <table class="dcf-table dcf-table-bordered">
<thead> <thead>
<tr> <tr>
<th>Download Specific File</th> <th>Download Specific File</th>
......
src/Views/home.php
+ 4
− 4
View file @ 96dcb13f
<div class="dcf-bleed"> <div class="dcf-bleed">
<section class="wdn-hero is-video center"> <section class="lockup-hero is-video center">
<video class="wdn-hero-video" muted autoplay="" loop="" poster="features/2016-spring-break-service/hero/2016-spring-break-service-md-min.jpg"> <video class="lockup-hero-video" muted autoplay="" loop="" poster="features/2016-spring-break-service/hero/2016-spring-break-service-md-min.jpg">
<source src="/videos/factory_milling.mp4"> <source src="/videos/factory_milling.mp4">
</video> </video>
<div class="wdn-hero-text"> <div class="lockup-hero-text">
<h2 class="wdn-hero-heading"> <h2 class="lockup-hero-heading">
<span class="hero-line">UNL Lockup Factory</span> <span class="hero-line">UNL Lockup Factory</span>
</h2> </h2>
</div> </div>
......
src/Views/lockup_library.php
+ 5
− 4
View file @ 96dcb13f
...@@ -9,18 +9,19 @@ ...@@ -9,18 +9,19 @@
<div class="dcf-wrapper"> <div class="dcf-wrapper">
<h3 class="page-title">Lockup Library</h3> <h3 class="page-title">Lockup Library</h3>
<form class="dcf-form"> <form class="dcf-form">
<label for="search-term">Search Lockups</label>
<div class="dcf-input-group"> <div class="dcf-input-group">
<input style="width: auto;" value="<?php echo $context->search_term ?>" type="text" placeholder="Search..." name="search_term"> <input value="<?php echo $context->search_term ?>" type="text" id="search-term" name="search_term">
<button type="submit" class="dcf-btn dcf-btn-secondary">Search</button> <button type="submit" class="dcf-btn dcf-btn-primary">Search</button>
<?php if (!empty($context->search_term)): ?> <?php if (!empty($context->search_term)): ?>
<button id="clear-search" class="dcf-btn dcf-btn-primary" type="button">&times;</button> <button id="clear-search" class="dcf-btn dcf-btn-secondary" type="button">&times;</button>
<?php endif; ?> <?php endif; ?>
</div> </div>
</form> </form>
<br> <br>
<?php foreach ($context->lockups as $chunk): ?> <?php foreach ($context->lockups as $chunk): ?>
<h4>Lockups Approved For <?php echo $chunk[0]->approver == '' ? '(unknown)' : $chunk[0]->approver->organization ?></h4> <h4>Lockups Approved For <?php echo $chunk[0]->approver == '' ? '(unknown)' : $chunk[0]->approver->organization ?></h4>
<table class="dcf-table"> <table class="dcf-table dcf-table-bordered">
<thead> <thead>
<tr> <tr>
<th>Title</th> <th>Title</th>
......
src/Views/main_template.php
+ 0
− 3
View file @ 96dcb13f
...@@ -23,9 +23,6 @@ $page->doctitle = '<title>UNL Lockup Factory</title>'; ...@@ -23,9 +23,6 @@ $page->doctitle = '<title>UNL Lockup Factory</title>';
$page->titlegraphic = '<a class="dcf-txt-h5" href="' . $baseURL . '">UNL Lockup Factory</a>'; $page->titlegraphic = '<a class="dcf-txt-h5" href="' . $baseURL . '">UNL Lockup Factory</a>';
$page->affiliation = '<a href="http://ucomm.unl.edu">University Communication</a>'; $page->affiliation = '<a href="http://ucomm.unl.edu">University Communication</a>';
// Add WDN Deprecated Styles
$page->head .= '<link rel="preload" href="/wdn/templates_5.3/css/deprecated.css" as="style" onload="this.onload=null;this.rel=\'stylesheet\'"> <noscript><link rel="stylesheet" href="/wdn/templates_5.3/css/deprecated.css"></noscript>';
# css # css
$page->addStyleSheet($baseURL . 'css/main.css'); $page->addStyleSheet($baseURL . 'css/main.css');
......
src/Views/manage_lockups.php
+ 25
− 25
View file @ 96dcb13f
...@@ -28,23 +28,23 @@ ...@@ -28,23 +28,23 @@
$str = '?'; $str = '?';
return $str . implode('&', array_map('outputParam', array_keys($array), $array)); return $str . implode('&', array_map('outputParam', array_keys($array), $array));
} }
// TODO: No 5.0 pagination css, so using 4.1
$context->scriptState->loadScriptDeclaration("WDN.loadCSS('https://unlcms.unl.edu/wdn/templates_4.1/css/modules/pagination.css');");
?> ?>
<div class="dcf-bleed dcf-pt-8 dcf-pb-8"> <div class="dcf-bleed dcf-pt-8 dcf-pb-8">
<div class="dcf-wrapper"> <div class="dcf-wrapper">
<h3 class="page-title">Manage Lockups</h3> <h3 class="page-title">Manage Lockups</h3>
<form> <form class="dcf-form">
<input style="width: auto;" value="<?php echo $context->search_term ?>" type="text" placeholder="Search..." name="search_term"> <label for="search-term">Search Lockups</label>
<button type="submit" class="dcf-btn wdn-button-triad">Search</button> <div class="dcf-input-group">
<input value="<?php echo $context->search_term ?>" type="text" name="search_term" id="search-term">
<button type="submit" class="dcf-btn dcf-btn-primary" >Search</button>
<?php if (!empty($context->search_term)): ?> <?php if (!empty($context->search_term)): ?>
<button id="clear-search" class="dcf-btn dcf-btn-primary" type="button">&times;</button> <button id="clear-search" class="dcf-btn dcf-btn-secondary" type="button">&times;</button>
<?php endif; ?> <?php endif; ?>
</div>
</form> </form>
<?php if (\Auth::$current_user->isAdmin()): ?> <?php if (\Auth::$current_user->isAdmin()): ?>
<h4 class="dcf-mt-6">All Lockups</h4> <h4 class="dcf-mt-6">All Lockups</h4>
<table> <table class="dcf-table dcf-table-bordered">
<thead> <thead>
<tr> <tr>
<th>ID</th> <th>ID</th>
...@@ -69,21 +69,21 @@ ...@@ -69,21 +69,21 @@
<td><?php echo $lockup->version; ?></td> <td><?php echo $lockup->version; ?></td>
<td class="table-actions right" style="min-width: 250px;"> <td class="table-actions right" style="min-width: 250px;">
<?php if ($lockup->isEditable()): ?> <?php if ($lockup->isEditable()): ?>
<a class="dcf-btn wdn-button-triad" href="<?php echo $lockup->getEditURL(); ?>">Edit</a> <a class="dcf-btn dcf-btn-secondary" href="<?php echo $lockup->getEditURL(); ?>">Edit</a>
<?php endif; ?> <?php endif; ?>
<?php if ($lockup->isGenerated() && $lockup->isPublished()): ?> <?php if ($lockup->isGenerated() && $lockup->isPublished()): ?>
<form action="<?php echo $lockup->getUnpublishURL(); ?>" method="POST" class="delete-form"> <form action="<?php echo $lockup->getUnpublishURL(); ?>" method="POST" class="dcf-form delete-form">
<button type="submit" class="dcf-btn">Unpublish</button> <button type="submit" class="dcf-btn dcf-btn-primary">Unpublish</button>
<input type="hidden" name="id" value="<?php echo $lockup->id ?>"> <input type="hidden" name="id" value="<?php echo $lockup->id ?>">
</form> </form>
<?php endif; ?> <?php endif; ?>
<?php if ($lockup->isGenerated() && !$lockup->isPublished()): ?> <?php if ($lockup->isGenerated() && !$lockup->isPublished()): ?>
<form action="<?php echo $lockup->getPublishURL(); ?>" method="POST" class="delete-form"> <form action="<?php echo $lockup->getPublishURL(); ?>" method="POST" class="dcf-form delete-form">
<button type="submit" class="dcf-btn wdn-button-complement">Publish</button> <button type="submit" class="dcf-btn dcf-btn-secondary">Publish</button>
<input type="hidden" name="id" value="<?php echo $lockup->id ?>"> <input type="hidden" name="id" value="<?php echo $lockup->id ?>">
</form> </form>
<?php endif; ?> <?php endif; ?>
<form action="<?php echo $lockup->getDeleteURL(); ?>" method="POST" class="delete-form"> <form action="<?php echo $lockup->getDeleteURL(); ?>" method="POST" class="dcf-form delete-form">
<button type="submit" class="dcf-btn dcf-btn-primary">Delete</button> <button type="submit" class="dcf-btn dcf-btn-primary">Delete</button>
<input type="hidden" name="id" value="<?php echo $lockup->id ?>"> <input type="hidden" name="id" value="<?php echo $lockup->id ?>">
</form> </form>
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<?php else: ?> <?php else: ?>
<?php if (\Auth::$current_user->isApprover()): ?> <?php if (\Auth::$current_user->isApprover()): ?>
<h4>Lockups Needing Communicator Approval</h4> <h4>Lockups Needing Communicator Approval</h4>
<table> <table class="dcf-table dcf-table-bordered">
<thead> <thead>
<tr> <tr>
<th>Title</th> <th>Title</th>
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
<?php endif; ?> <?php endif; ?>
<?php if (\Auth::$current_user->isCreative()): ?> <?php if (\Auth::$current_user->isCreative()): ?>
<h4>Lockups Needing Creative Approval</h4> <h4>Lockups Needing Creative Approval</h4>
<table> <table class="dcf-table dcf-table-bordered">
<thead> <thead>
<tr> <tr>
<th>Title</th> <th>Title</th>
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
<br> <br>
<?php endif; ?> <?php endif; ?>
<h4>My Lockups</h4> <h4>My Lockups</h4>
<table> <table class="dcf-table dcf-table-bordered">
<thead> <thead>
<tr> <tr>
<th>Title</th> <th>Title</th>
...@@ -252,21 +252,21 @@ ...@@ -252,21 +252,21 @@
<td><?php echo $lockup->getFullStatusText(); ?></td> <td><?php echo $lockup->getFullStatusText(); ?></td>
<td class="table-actions right" style="min-width: 200px;"> <td class="table-actions right" style="min-width: 200px;">
<?php if ($lockup->isEditable()): ?> <?php if ($lockup->isEditable()): ?>
<a class="dcf-btn wdn-button-triad" href="<?php echo $lockup->getEditURL(); ?>">Edit</a> <a class="dcf-btn dcf-btn-secondary" href="<?php echo $lockup->getEditURL(); ?>">Edit</a>
<?php endif; ?> <?php endif; ?>
<?php if ($lockup->isGenerated() && $lockup->isPublished()): ?> <?php if ($lockup->isGenerated() && $lockup->isPublished()): ?>
<form action="<?php echo $lockup->getUnpublishURL(); ?>" method="POST" class="delete-form"> <form action="<?php echo $lockup->getUnpublishURL(); ?>" method="POST" class="dcf-form delete-form">
<button type="submit" class="dcf-btn">Unpublish</button> <button type="submit" class="dcf-btn dcf-btn-primary">Unpublish</button>
<input type="hidden" name="id" value="<?php echo $lockup->id ?>"> <input type="hidden" name="id" value="<?php echo $lockup->id ?>">
</form> </form>
<?php endif; ?> <?php endif; ?>
<?php if ($lockup->isGenerated() && !$lockup->isPublished()): ?> <?php if ($lockup->isGenerated() && !$lockup->isPublished()): ?>
<form action="<?php echo $lockup->getPublishURL(); ?>" method="POST" class="delete-form"> <form action="<?php echo $lockup->getPublishURL(); ?>" method="POST" class="dcf-form delete-form">
<button type="submit" class="dcf-btn wdn-button-complement">Publish</button> <button type="submit" class="dcf-btn dcf-btn-secondary">Publish</button>
<input type="hidden" name="id" value="<?php echo $lockup->id ?>"> <input type="hidden" name="id" value="<?php echo $lockup->id ?>">
</form> </form>
<?php endif; ?> <?php endif; ?>
<form action="<?php echo $lockup->getDeleteURL(); ?>" method="POST" class="delete-form"> <form action="<?php echo $lockup->getDeleteURL(); ?>" method="POST" class="dcf-form delete-form">
<button type="submit" class="dcf-btn dcf-btn-primary">Delete</button> <button type="submit" class="dcf-btn dcf-btn-primary">Delete</button>
<input type="hidden" name="id" value="<?php echo $lockup->id ?>"> <input type="hidden" name="id" value="<?php echo $lockup->id ?>">
</form> </form>
......
src/Views/new_lockup.php
+ 17
− 8
View file @ 96dcb13f
<?php $infoIconSVG = \UNL\Templates\Icons::get(\UNL\Templates\Icons::ICON_INFO, '{"title": "Info Tooltip", "size": 6}'); ?>
<div class="dcf-bleed dcf-pt-8 dcf-pb-8"> <div class="dcf-bleed dcf-pt-8 dcf-pb-8">
<div class="dcf-wrapper"> <div class="dcf-wrapper">
<h3 class="page-title">Create New Lockup</h3> <h3 class="page-title">Create New Lockup</h3>
...@@ -187,7 +188,8 @@ ...@@ -187,7 +188,8 @@
<div id="organization-field"> <div id="organization-field">
<label for="organization">Organization</label> <label for="organization">Organization</label>
<div class="tooltip wdn-icon-info italic hang-right"> <div class="tooltip italic hang-right">
<?php echo $infoIconSVG; ?>
<div> <div>
31 characters max 31 characters max
</div> </div>
...@@ -196,7 +198,8 @@ ...@@ -196,7 +198,8 @@
</div> </div>
<div id="organization-second-line-field" style="display: none;"> <div id="organization-second-line-field" style="display: none;">
<label for="organization-second-line">Organization Second Line</label> <label for="organization-second-line">Organization Second Line</label>
<div class="tooltip wdn-icon-info italic hang-right"> <div class="tooltip italic hang-right">
<?php echo $infoIconSVG; ?>
<div> <div>
31 characters max 31 characters max
</div> </div>
...@@ -205,7 +208,8 @@ ...@@ -205,7 +208,8 @@
</div> </div>
<div id="subject-field" style="display: none;"> <div id="subject-field" style="display: none;">
<label for="subject">Subject</label> <label for="subject">Subject</label>
<div class="tooltip wdn-icon-info italic hang-right"> <div class="tooltip italic hang-right">
<?php echo $infoIconSVG; ?>
<div> <div>
40 characters max 40 characters max
</div> </div>
...@@ -215,7 +219,8 @@ ...@@ -215,7 +219,8 @@
</div> </div>
<div id="subject-second-line-field" style="display: none;"> <div id="subject-second-line-field" style="display: none;">
<label for="subject-second-line">Subject Second Line</label> <label for="subject-second-line">Subject Second Line</label>
<div class="tooltip wdn-icon-info italic hang-right"> <div class="tooltip italic hang-right">
<?php echo $infoIconSVG; ?>
<div> <div>
40 characters max 40 characters max
</div> </div>
...@@ -225,7 +230,8 @@ ...@@ -225,7 +230,8 @@
</div> </div>
<div id="acronym-field" style="display: none;"> <div id="acronym-field" style="display: none;">
<label for="acronym">Acronym</label> <label for="acronym">Acronym</label>
<div class="tooltip wdn-icon-info italic hang-right"> <div class="tooltip italic hang-right">
<?php echo $infoIconSVG; ?>
<div> <div>
10 characters max 10 characters max
</div> </div>
...@@ -235,7 +241,8 @@ ...@@ -235,7 +241,8 @@
</div> </div>
<div id="acronym-second-line-field" style="display: none;"> <div id="acronym-second-line-field" style="display: none;">
<label for="acronym-second-line">Acronym Second Line</label> <label for="acronym-second-line">Acronym Second Line</label>
<div class="tooltip wdn-icon-info italic hang-right"> <div class="tooltip italic hang-right">
<?php echo $infoIconSVG; ?>
<div> <div>
10 characters max 10 characters max
</div> </div>
...@@ -245,7 +252,8 @@ ...@@ -245,7 +252,8 @@
</div> </div>
<div id="acronym-subject-field" style="display: none;"> <div id="acronym-subject-field" style="display: none;">
<label for="acronym-subject">Subject Acronym</label> <label for="acronym-subject">Subject Acronym</label>
<div class="tooltip wdn-icon-info italic hang-right"> <div class="tooltip italic hang-right">
<?php echo $infoIconSVG; ?>
<div> <div>
15 characters max 15 characters max
</div> </div>
...@@ -255,7 +263,8 @@ ...@@ -255,7 +263,8 @@
</div> </div>
<div id="extension-county-field" style="display: none;"> <div id="extension-county-field" style="display: none;">
<label for="extension-county">Extension County</label> <label for="extension-county">Extension County</label>
<div class="tooltip wdn-icon-info italic hang-right"> <div class="tooltip italic hang-right">
<?php echo $infoIconSVG; ?>
<div> <div>
40 characters max 40 characters max
</div> </div>
......
src/Views/preview_lockup.php
+ 16
− 10
View file @ 96dcb13f
...@@ -64,14 +64,20 @@ ...@@ -64,14 +64,20 @@
</div> </div>
<div class="tools dcf-txt-center"> <div class="tools dcf-txt-center">
<?php if ($context->lockup->user_id == \Auth::$current_user->id || \Auth::$current_user->isAdmin()): ?> <?php if ($context->lockup->user_id == \Auth::$current_user->id || \Auth::$current_user->isAdmin()): ?>
<div><a class="dcf-btn wdn-button-triad" href="<?php echo $context->lockup->getEditURL(); ?>">Edit Lockup</a></div><br> <div><a class="dcf-btn dcf-btn-secondary" href="<?php echo $context->lockup->getEditURL(); ?>">Edit Lockup</a></div><br>
<?php endif; ?> <?php endif; ?>
<?php if ($context->lockup->isFullyApproved() && ($context->lockup->user_id == \Auth::$current_user->id || \Auth::$current_user->isAdmin())): ?> <?php if ($context->lockup->isFullyApproved() && ($context->lockup->user_id == \Auth::$current_user->id || \Auth::$current_user->isAdmin())): ?>
<form method="POST" action="/lockups/generate/" id="generate" class="dcf-txt-center" style="background-color: #DDDDDD">
<div><label>You have permission to generate this lockup. Click "Generate Files" below to begin.</label></div> <form method="POST" action="/lockups/generate/" id="generate" class="dcf-form dcf-txt-center dcf-p-4 dcf-b-1 dcf-b-solid dcf-m-auto" style="max-width: 500px">
<input type="text" class="hidden" value="<?php echo $context->lockup->id ?>" name="id"> <p>You have permission to generate this lockup. Click "Generate Files" below to begin.</p>
<button type="submit" class="dcf-btn wdn-button-complement" id="submit-generate">Generate Files</button><br> <input type="hidden" value="<?php echo $context->lockup->id ?>" name="id">
<input type="checkbox" checked="checked" id="publish-lockup" name="publish-lockup"><label for="publish-lockup">Publish lockup for all UNL users?</label> <button type="submit" class="dcf-btn dcf-btn-secondary" id="submit-generate">Generate Files</button>
<div class="dcf-form-group">
<div class="dcf-mt-3 dcf-input-checkbox dcf-m-auto" style="max-width: 300px">
<input type="checkbox" checked="checked" id="publish-lockup" name="publish-lockup">
<label for="publish-lockup">Publish lockup for all UNL users?</label>
</div>
</div>
<div style="display: none;" id="going-message"> <div style="display: none;" id="going-message">
<img src="/images/spinner.svg" style="height: 16px;"> <img src="/images/spinner.svg" style="height: 16px;">
<label style="font-style: italic;">And off we go! This will take a little while. Please be patient, we'll redirect you when this is complete.</label> <label style="font-style: italic;">And off we go! This will take a little while. Please be patient, we'll redirect you when this is complete.</label>
...@@ -80,12 +86,12 @@ ...@@ -80,12 +86,12 @@
<br> <br>
<?php endif; ?> <?php endif; ?>
<form id="approve" class="dcf-txt-center"> <form id="approve" class="dcf-form dcf-txt-center">
<?php if ((\Auth::$current_user->isApprover() && $context->lockup->approver_id == \Auth::$current_user->id) || <?php if ((\Auth::$current_user->isApprover() && $context->lockup->approver_id == \Auth::$current_user->id) ||
(\Auth::$current_user->isCreative()) || (\Auth::$current_user->isCreative()) ||
\Auth::$current_user->isAdmin()): ?> \Auth::$current_user->isAdmin()): ?>
<button id="approve-lockup" type="button" class="dcf-btn wdn-button-complement">Approve This Lockup</button> <button id="approve-lockup" type="button" class="dcf-btn dcf-btn-secondary">Approve This Lockup</button>
<button id="leave-feedback" type="button" class="dcf-btn wdn-button-triad">Just Leave Feedback</button> <button id="leave-feedback" type="button" class="dcf-btn dcf-btn-secondary">Just Leave Feedback</button>
<button id="deny-lockup" type="button" class="dcf-btn dcf-btn-primary">Deny This Lockup</button> <button id="deny-lockup" type="button" class="dcf-btn dcf-btn-primary">Deny This Lockup</button>
<div style="margin-top: 1em;"><label>Feedback will be left whichever option you choose above.</label></div> <div style="margin-top: 1em;"><label>Feedback will be left whichever option you choose above.</label></div>
<?php endif; ?> <?php endif; ?>
......
src/Views/regenerate.php
+ 3
− 3
View file @ 96dcb13f
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
</div> </div>
<div class="tools dcf-txt-center"> <div class="tools dcf-txt-center">
<?php if ($context->lockup->isFullyApproved()): ?> <?php if ($context->lockup->isFullyApproved()): ?>
<form method="POST" action="/lockups/regenerate/" id="regenerate" class="dcf-txt-center"> <form method="POST" action="/lockups/regenerate/" id="regenerate" class="dcf-form dcf-txt-center">
<input type="text" class="hidden" value="<?php echo $context->lockup->id ?>" name="id"> <input type="hidden" value="<?php echo $context->lockup->id ?>" name="id">
<button type="submit" class="dcf-btn wdn-button-triad" id="submit-regenerate">Regenerate Files</button> <button type="submit" class="dcf-btn dcf-btn-secondary" id="submit-regenerate">Regenerate Files</button>
<div style="display: none;" id="going-message"> <div style="display: none;" id="going-message">
<img src="/images/spinner.svg" style="height: 16px;"> <img src="/images/spinner.svg" style="height: 16px;">
<label style="font-style: italic;">And off we go! This will take a little while. Please be patient, we'll redirect you when this is complete.</label> <label style="font-style: italic;">And off we go! This will take a little while. Please be patient, we'll redirect you when this is complete.</label>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment