From 89978125a0913a1ab541fc9f00801db956957cd5 Mon Sep 17 00:00:00 2001 From: Kurt Gawinowicz Date: Tue, 16 Aug 2016 19:43:40 -0400 Subject: [PATCH 1/2] Change bootstrap breakpoints to 1024px --- site-root/css/bootstrap/bootstrap.css | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/site-root/css/bootstrap/bootstrap.css b/site-root/css/bootstrap/bootstrap.css index ca720b6b..af5fa69e 100644 --- a/site-root/css/bootstrap/bootstrap.css +++ b/site-root/css/bootstrap/bootstrap.css @@ -4072,12 +4072,12 @@ select[multiple].input-group-sm > .input-group-btn > .btn { margin-bottom: 20px; border: 1px solid transparent; } -@media (min-width: 768px) { +@media (min-width: 1024px) { .navbar { border-radius: 4px; } } -@media (min-width: 768px) { +@media (min-width: 1024px) { .navbar-header { float: left; } @@ -4094,7 +4094,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-collapse.in { overflow-y: auto; } -@media (min-width: 768px) { +@media (min-width: 1024px) { .navbar-collapse { width: auto; border-top: 0; @@ -4134,7 +4134,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { margin-right: -15px; margin-left: -15px; } -@media (min-width: 768px) { +@media (min-width: 1024px) { .container > .navbar-header, .container-fluid > .navbar-header, .container > .navbar-collapse, @@ -4147,7 +4147,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { z-index: 1000; border-width: 0 0 1px; } -@media (min-width: 768px) { +@media (min-width: 1024px) { .navbar-static-top { border-radius: 0; } @@ -4159,7 +4159,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { left: 0; z-index: 1030; } -@media (min-width: 768px) { +@media (min-width: 1024px) { .navbar-fixed-top, .navbar-fixed-bottom { border-radius: 0; @@ -4188,7 +4188,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-brand > img { display: block; } -@media (min-width: 768px) { +@media (min-width: 1024px) { .navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand { margin-left: -15px; @@ -4218,7 +4218,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-toggle .icon-bar + .icon-bar { margin-top: 4px; } -@media (min-width: 768px) { +@media (min-width: 1024px) { .navbar-toggle { display: none; } @@ -4231,7 +4231,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { padding-bottom: 10px; line-height: 20px; } -@media (max-width: 767px) { +@media (max-width: 1023px) { .navbar-nav .open .dropdown-menu { position: static; float: none; @@ -4254,7 +4254,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { background-image: none; } } -@media (min-width: 768px) { +@media (min-width: 1024px) { .navbar-nav { float: left; margin: 0; @@ -4278,7 +4278,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1); box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1); } -@media (min-width: 768px) { +@media (min-width: 1024px) { .navbar-form .form-group { display: inline-block; margin-bottom: 0; @@ -4328,7 +4328,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { top: 0; } } -@media (max-width: 767px) { +@media (max-width: 1023px) { .navbar-form .form-group { margin-bottom: 5px; } @@ -4336,7 +4336,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { margin-bottom: 0; } } -@media (min-width: 768px) { +@media (min-width: 1024px) { .navbar-form { width: auto; padding-top: 0; @@ -4383,7 +4383,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { margin-left: 15px; } } -@media (min-width: 768px) { +@media (min-width: 1024px) { .navbar-left { float: left !important; } @@ -4450,7 +4450,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { color: #555; background-color: #e7e7e7; } -@media (max-width: 767px) { +@media (max-width: 1023px) { .navbar-default .navbar-nav .open .dropdown-menu > li > a { color: #777; } @@ -4546,7 +4546,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { color: #fff; background-color: #080808; } -@media (max-width: 767px) { +@media (max-width: 1023px) { .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { border-color: #080808; } From 017c8a8698ac48417f5c4d0ec65f75db4f1f1954 Mon Sep 17 00:00:00 2001 From: Kurt Gawinowicz Date: Tue, 16 Aug 2016 19:43:57 -0400 Subject: [PATCH 2/2] Improve misc markup --- html-templates/home.tpl | 8 +- html-templates/includes/site.footer.tpl | 6 +- html-templates/login/login.tpl | 11 +- html-templates/people/person.tpl | 16 +- html-templates/projects/projectEdit.tpl | 201 +++++++++--------- html-templates/projects/projectSaved.tpl | 3 + html-templates/register/recoverPassword.tpl | 53 +++-- html-templates/register/register.tpl | 2 +- html-templates/register/registerComplete.tpl | 6 +- .../subtemplates/locale-selector.tpl | 3 +- 10 files changed, 156 insertions(+), 153 deletions(-) diff --git a/html-templates/home.tpl b/html-templates/home.tpl index 37dca695..a1420df6 100644 --- a/html-templates/home.tpl +++ b/html-templates/home.tpl @@ -23,11 +23,11 @@

{Laddr::$siteSlogan|escape}

@@ -124,4 +124,4 @@ -{/block} \ No newline at end of file +{/block} diff --git a/html-templates/includes/site.footer.tpl b/html-templates/includes/site.footer.tpl index 5b0fa4e5..d871858e 100644 --- a/html-templates/includes/site.footer.tpl +++ b/html-templates/includes/site.footer.tpl @@ -2,9 +2,11 @@ {capture assign=laddrLink}Laddr{/capture} {capture assign=cfpLink}Code for Philly{/capture} -{sprintf(_("Powered by %s — a %s project."), $laddrLink, $cfpLink)} -
+ +

{sprintf(_("Powered by %s — a %s project."), $laddrLink, $cfpLink)}

+ {localeSelector} + {* {if $.responseId == 'home'}
Cover photo by XXXXXX. diff --git a/html-templates/login/login.tpl b/html-templates/login/login.tpl index 2c1a949b..3a8441d1 100644 --- a/html-templates/login/login.tpl +++ b/html-templates/login/login.tpl @@ -41,13 +41,10 @@ -
- {capture assign=recoverLink}{_ "recover your password"}{/capture} - {capture assign=registerLink}{_ "create an account"}{/capture} -
-

{sprintf(_('You can %s, or %s now.'), $recoverLink, $registerLink)}

-
-
+ {capture assign=recoverLink}{_ "recover your password"}{/capture} + {capture assign=registerLink}{_ "create an account"}{/capture} + +

{sprintf(_('You can %s, or %s now.'), $recoverLink, $registerLink)}

{/strip} {foreach item=value key=name from=$postVars} diff --git a/html-templates/people/person.tpl b/html-templates/people/person.tpl index e8a8dfce..d1b07702 100644 --- a/html-templates/people/person.tpl +++ b/html-templates/people/person.tpl @@ -8,14 +8,14 @@
{if $.User->ID == $Person->ID || (ProfileRequestHandler::$accountLevelEditOthers && $.User->hasAccountLevel(ProfileRequestHandler::$accountLevelEditOthers))} -
+

Edit Profile {if $.User->hasAccountLevel('Staff')} Delete {personName $Person} {/if}
-
+

{/if}

{personName $Person}

@@ -26,11 +26,13 @@
- {avatar $Person size=200 imgCls="img-responsive"} -
- {foreach item=Photo from=$Person->Photos} - - {/foreach} +
+ {avatar $Person size=200 imgCls="img-responsive"} +
+ {foreach item=Photo from=$Person->Photos} + + {/foreach} +
diff --git a/html-templates/projects/projectEdit.tpl b/html-templates/projects/projectEdit.tpl index 807f4a9a..92bc8804 100644 --- a/html-templates/projects/projectEdit.tpl +++ b/html-templates/projects/projectEdit.tpl @@ -12,108 +12,109 @@ {block content} {$Project = $data} -
-

- {if $Project->isPhantom} - {_ "Create new project"} - {else} - {_("Edit project %s")|sprintf:$Project->Title|escape} - {/if} -

-
- - {if !$Project->isValid} -
- {_ "There were problems with your entry:"} -
    - {foreach item=error key=field from=$Project->validationErrors} -
  • {$error}
    • - {/foreach} -
-
- {/if} +
+
+
+
+

+ {if $Project->isPhantom} + {_ "Create new project"} + {else} + {_("Edit project %s")|sprintf:$Project->Title|escape} + {/if} +

+
+ {if !$Project->isValid} +
+ {_ "There were problems with your entry:"} +
    + {foreach item=error key=field from=$Project->validationErrors} +
  • {$error}
    • + {/foreach} +
+
+ {/if} -
-
- -
- + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+

{_ 'Stage'}:

+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +
+ +
+
+ +
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - - - - - - -
-
-
- -
- -

- -
-
- +
{/block} \ No newline at end of file diff --git a/html-templates/projects/projectSaved.tpl b/html-templates/projects/projectSaved.tpl index 57a4c49a..19e2cafa 100644 --- a/html-templates/projects/projectSaved.tpl +++ b/html-templates/projects/projectSaved.tpl @@ -7,6 +7,9 @@ {capture assign=projectLink}{projectLink $Project}{/capture} +
+

Project Created

+
{if $Project->isNew}

{_("Your project has been created: %s")|sprintf:$projectLink}

{else} diff --git a/html-templates/register/recoverPassword.tpl b/html-templates/register/recoverPassword.tpl index 503149ca..3730f48d 100644 --- a/html-templates/register/recoverPassword.tpl +++ b/html-templates/register/recoverPassword.tpl @@ -3,35 +3,32 @@ {block "title"}Reset Password — {$dwoo.parent}{/block} {block "content"} - -
-

Reset Your Password

-
+
+
+
+

Reset Your Password

+
-

Enter the username or email address associated with your account below, and you will receive an email with instructions to reset your password.

+

Enter the username or email address associated with your account below, and you will receive an email with instructions to reset your password.

- {if $error} -
-

{_ "There were problems with your submission:"}

-
    -
  • {$error|escape}
    • -
-
- {/if} - -
-
- -
- -
-
- -
-
- -
+ {if $error} +
+

{_ "There were problems with your submission:"}

+
    +
  • {$error|escape}
    • +
+
+ {/if} + + +
+ + +
+
+ +
+
- +
{/block} \ No newline at end of file diff --git a/html-templates/register/register.tpl b/html-templates/register/register.tpl index 3f56df17..98916d9e 100644 --- a/html-templates/register/register.tpl +++ b/html-templates/register/register.tpl @@ -69,7 +69,7 @@ {/if}
- +

{_ "Already have an account?"} {_ "Log in"}

{/strip} diff --git a/html-templates/register/registerComplete.tpl b/html-templates/register/registerComplete.tpl index 641917d2..e41967b7 100644 --- a/html-templates/register/registerComplete.tpl +++ b/html-templates/register/registerComplete.tpl @@ -5,9 +5,9 @@ {block "content"} {$User = $data} -
-

{_ "Registration complete"}

-
+
+

{_ "Registration complete"}

+
{capture assign=personLink}{$User->Username|escape}{/capture}

{"Your username for %s is: %s"|_|sprintf:Laddr::$siteName:$personLink}

diff --git a/html-templates/subtemplates/locale-selector.tpl b/html-templates/subtemplates/locale-selector.tpl index eae1f432..08abe235 100644 --- a/html-templates/subtemplates/locale-selector.tpl +++ b/html-templates/subtemplates/locale-selector.tpl @@ -1,7 +1,8 @@ {template localeSelector} {$locales = Emergence\Locale::getAvailableLocales()} {if count($locales) > 1} - {foreach item=locale from=$locales} {/foreach}