Skip to content

Commit

Permalink
Merge branch '2.0-release'
Browse files Browse the repository at this point in the history
  • Loading branch information
emodric committed Oct 31, 2017
2 parents e832c39 + 68d3a7c commit a292fb2
Show file tree
Hide file tree
Showing 11 changed files with 196 additions and 72 deletions.
6 changes: 3 additions & 3 deletions Resources/public/css/style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Resources/public/css/style.css.map

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions Resources/sass/_base.scss
Expand Up @@ -764,7 +764,8 @@ table.list {
.form-group label {font-weight:400; font-size:1em;}
select.form-control {
-webkit-appearance:none; -moz-appearance:none; appearance:none; background:#f8f8f8 url(../images/select-bg.png) no-repeat right 5px center; background-size:contain; padding-right:18px; padding-left:8px; cursor:pointer;
&.form-control-multiple {
&.form-control-multiple,
&[multiple] {
background-image:none; padding:0;
option {
padding:2px 10px;
Expand Down Expand Up @@ -1229,7 +1230,7 @@ table {
}

.box-header {
border:none; margin:0; font-size:100%; background:$lightBg; padding:0 $gutter; display:inline-block; width:100%;
border:none; margin:0; font-size:100%; background:$lightBg; padding:$gutter $gutter 0; display:inline-block; width:100%;
h1 {
margin:0 0 20px; font-size:23px; color:#333;
.small-info {
Expand Down
@@ -1,23 +1,27 @@
{* DO NOT EDIT THIS FILE! Use an override template instead. *}
{let class_list=fetch( class, list )}
<div id="package" class="create">
<div id="sid-{$current_step.id|wash}" class="pc-{$creator.id|wash}">
<div id="sid-{$current_step.id|wash}" class="pc-{$creator.id|wash} panel">
<div class="row">
<div class="col-sm-6 col-lg-4">

<form enctype="multipart/form-data" method="post" action={'package/create'|ezurl}>
<form enctype="multipart/form-data" method="post" action={'package/create'|ezurl}>

{include uri="design:package/create/error.tpl"}
{include uri="design:package/create/error.tpl"}

{include uri="design:package/header.tpl"}
<div class="block">
<p>{'Please select a thumbnail file to be included in the package,
if you do not want to have a thumbnail simply click Next.'|i18n('design/standard/package')|break}</p>
{include uri="design:package/header.tpl"}
<p>{'Please select a thumbnail file to be included in the package,
if you do not want to have a thumbnail simply click Next.'|i18n('design/standard/package')|break}</p>

<input type="hidden" name="MAX_FILE_SIZE" value="32000000" />
<input class="box" name="PackageThumbnail" type="file" />
<div class="form-group">
<input type="hidden" name="MAX_FILE_SIZE" value="32000000" />
<input class="box form-control" name="PackageThumbnail" type="file" />
</div>

{include uri="design:package/navigator.tpl"}
</div>
</form>
{include uri="design:package/navigator.tpl"}
</form>
</div>
</div>

</div>
</div>
Expand Down
@@ -0,0 +1,51 @@
{* DO NOT EDIT THIS FILE! Use an override template instead. *}

{def $class_list_by_group = hash()}
{def $class_list = fetch( class, list_by_groups, hash( group_filter, false() ) )}

{foreach $class_list as $class}
{if is_set( $class_list_by_group[$class.ingroup_list.0.group_name] )}
{set $class_list_by_group = $class_list_by_group|merge( hash( $class.ingroup_list.0.group_name, $class_list_by_group[$class.ingroup_list.0.group_name]|append( $class ) ) )}
{else}
{set $class_list_by_group = $class_list_by_group|merge( hash( $class.ingroup_list.0.group_name, array( $class ) ) )}
{/if}
{/foreach}

<div id="package" class="create">
<div id="sid-{$current_step.id|wash}" class="pc-{$creator.id|wash} panel">

<form method="post" action={'package/create'|ezurl}>

{include uri="design:package/create/error.tpl"}

{include uri="design:package/header.tpl"}

<p>{'Please choose the content classes you want to be included in the package.'|i18n('design/standard/package')}</p>

<div class="form-inline">
<div class="form-group">
<label>{'Class list'|i18n('design/standard/package')}</label>
</div>
<div class="form-group">
<select class="listbox form-control" name="ClassList[]" multiple="multiple" size="">
{foreach $class_list_by_group as $group_name => $group_classes}
<option disabled="disabled" value="group_{$group_name|wash}">{$group_name|wash}</option>
{foreach $group_classes as $class}
<option value="{$class.id}">&nbsp;&nbsp;&nbsp;{$class.name|wash}</option>
{/foreach}
{/foreach}
</select>
</div>
</div>

{include uri="design:package/navigator.tpl"}

</form>

</div>
</div>
<script>
const listBoxMultiple = document.getElementsByClassName('listbox')[0];
listBoxMultiple.setAttribute('size', listBoxMultiple.children.length < 30 ? listBoxMultiple.children.length : 30);
</script>
{undef $class_list_by_group $class_list}
@@ -0,0 +1,25 @@
<div id="package" class="create">
<div id="sid-{$current_step.id|wash}" class="pc-{$creator.id|wash} panel">

<form enctype="multipart/form-data" method="post" action={'package/create'|ezurl}>

{include uri="design:package/create/error.tpl"}

{include uri="design:package/header.tpl"}

<p>{'Please select the extensions to be exported.'|i18n('design/standard/package')}</p>

<div class="form-group">
{foreach $extension_list as $extension}
<div class="checkbox">
<label><input name="PackageExtensionNames[]" type="checkbox" value="{$extension|wash}" /> {$extension|wash}</label>
</div>
{/foreach}
</div>
{include uri="design:package/navigator.tpl"}

</form>

</div>
</div>

@@ -1,30 +1,34 @@
{* DO NOT EDIT THIS FILE! Use an override template instead. *}
{let class_list=fetch( class, list )}
<div id="package" class="create">
<div id="sid-{$current_step.id|wash}" class="pc-{$creator.id|wash}">
<div id="sid-{$current_step.id|wash}" class="pc-{$creator.id|wash} panel">
<div class="row">
<div class="col-sm-6 col-lg-4">

<form enctype="multipart/form-data" method="post" action={'package/create'|ezurl}>
<form enctype="multipart/form-data" method="post" action={'package/create'|ezurl}>

{include uri="design:package/create/error.tpl"}
{include uri="design:package/create/error.tpl"}

{include uri="design:package/header.tpl"}
<div class="block">
<p>{'Please select the site CSS file to be included in the package.'|i18n('design/admin/package')}</p>
{include uri="design:package/header.tpl"}
<div class="form-group">
<p>{'Please select the site CSS file to be included in the package.'|i18n('design/admin/package')}</p>

<input type="hidden" name="MAX_FILE_SIZE" value="32000000" />
<input class="box" name="PackageSiteCSSFile" type="file" />
</div>
<input type="hidden" name="MAX_FILE_SIZE" value="32000000" />
<input class="box form-control" name="PackageSiteCSSFile" type="file" />
</div>

<div class="block">
<p>{'Please select the classes CSS file to be included in the package.'|i18n('design/admin/package')}</p>
<div class="form-group">
<p>{'Please select the classes CSS file to be included in the package.'|i18n('design/admin/package')}</p>

<input type="hidden" name="MAX_FILE_SIZE" value="32000000" />
<input class="box" name="PackageClassesCSSFile" type="file" />
</div>
<input type="hidden" name="MAX_FILE_SIZE" value="32000000" />
<input class="box form-control" name="PackageClassesCSSFile" type="file" />
</div>

{include uri="design:package/navigator.tpl"}
{include uri="design:package/navigator.tpl"}

</form>
</form>
</div>
</div>

</div>
</div>
Expand Down
@@ -1,36 +1,39 @@
{* DO NOT EDIT THIS FILE! Use an override template instead. *}
{let class_list=fetch( class, list )}
<div id="package" class="create">
<div id="sid-{$current_step.id|wash}" class="pc-{$creator.id|wash}">

<form enctype="multipart/form-data" method="post" action={'package/create'|ezurl}>

{include uri="design:package/create/error.tpl"}

{include uri="design:package/header.tpl"}

<p>{'Select an image file to be included in the package then click Next.
Click "Next" without choosing an image to continue to the next step.'|i18n('design/admin/package')|break}</p>

{section show=$persistent_data.imagefiles}
<div class="files">
<h3>{'Currently added image files'|i18n('design/admin/package')}</h3>
<ul>
{section var=imagefile loop=$persistent_data.imagefiles}
<li>{$imagefile.filename|wash}</li>
{/section}
</ul>
</div>
{/section}

<div class="block">
<input type="hidden" name="MAX_FILE_SIZE" value="32000000" />
<input class="box" name="PackageImageFile" type="file" />
</div>

{include uri="design:package/navigator.tpl"}

</form>
<div id="sid-{$current_step.id|wash}" class="pc-{$creator.id|wash} panel">
<div class="row">
<div class="col-sm-6 col-lg-4">

<form enctype="multipart/form-data" method="post" action={'package/create'|ezurl}>

{include uri="design:package/create/error.tpl"}

{include uri="design:package/header.tpl"}

<p>{'Select an image file to be included in the package then click Next.
Click "Next" without choosing an image to continue to the next step.'|i18n('design/admin/package')|break}</p>

{section show=$persistent_data.imagefiles}
<div class="files">
<h3>{'Currently added image files'|i18n('design/admin/package')}</h3>
<ul>
{section var=imagefile loop=$persistent_data.imagefiles}
<li>{$imagefile.filename|wash}</li>
{/section}
</ul>
</div>
{/section}
<div class="form-group">
<input type="hidden" name="MAX_FILE_SIZE" value="32000000" />
<input class="box form-control" name="PackageImageFile" type="file" />
</div>

{include uri="design:package/navigator.tpl"}

</form>
</div>
</div>

</div>
</div>
Expand Down
@@ -0,0 +1,18 @@
{* DO NOT EDIT THIS FILE! Use an override template instead. *}
<input type="hidden" name="CreatorItemID" value="{$creator.id|wash}" />
<input type="hidden" name="CreatorStepID" value="{$current_step.id|wash}" />
<input type="hidden" name="PackageStep" value="1" />




{* DESIGN: Header START *}<div class="box-header">
<h1 class="context-title">
{'Package wizard: %wizardname'|i18n( 'design/admin/package',, hash( '%wizardname', $creator.name|wash ) )}
</h1>

{* DESIGN: Mainline *}<div class="header-mainline"></div>

{* DESIGN: Header END *}</div>

<h2>{$current_step.name|wash}</h2>
@@ -0,0 +1,18 @@

<div class="controlbar">
{* DESIGN: Control bar START *}


{if $current_step.next_step}
<div class="block">
<input class="button" type="submit" name="NextStepButton" value="{'Next %arrowright'|i18n( 'design/admin/package',, hash( '%arrowright', '&raquo;' ) )}" />
</div>
{else}
<div class="block">
<input class="button" type="submit" name="NextStepButton" value="{'Continue'|i18n( 'design/admin/package' )}" />
</div>
{/if}


{* DESIGN: Control bar END *}
</div>
Expand Up @@ -32,17 +32,17 @@


<div class="panel">
{* DESIGN: Header START *}
<div class="panel-hl">
<h3>{'Change password for %username'|i18n( 'design/admin/user/password',, hash( '%username', $userAccount.login ) )|wash}</h3>
</div>

{* DESIGN: Mainline *}
{* DESIGN: Header END *}

<div class="row">
<div class="col-lg-6">
<form name="Password" method="post" action={concat( $module.functions.password.uri, '/', $userID )|ezurl}>

{* DESIGN: Header START *}
<div class="panel-hl">
<h3>{'Change password for %username'|i18n( 'design/admin/user/password',, hash( '%username', $userAccount.login ) )|wash}</h3>
</div>

{* DESIGN: Mainline *}
{* DESIGN: Header END *}
{* DESIGN: Content START *}

{* Username. *}
Expand Down

0 comments on commit a292fb2

Please sign in to comment.