Commit afa386bc authored by Liam Sharpe's avatar Liam Sharpe Committed by Son Nguyen

font page styling - Bug #1465107

behatnotneeded

Change-Id: I338cb3ed90f080e7b49de2b9aa73871d2ad4a3e2
parent c3c1cea8
......@@ -64,6 +64,7 @@ $form = pieform(array(
'submit' => array(
'type' => 'submitcancel',
'title' => $submittitle,
'class' => 'btn-success',
'value' => array(get_string('yes'), get_string('no')),
'goto' => get_config('wwwroot') . 'admin/site/fonts.php',
)
......@@ -128,4 +129,4 @@ function recurse_remove_dir($dir) {
(is_dir("$dir/$file")) ? recurse_remove_dir("$dir/$file") : unlink("$dir/$file");
}
return rmdir($dir);
}
\ No newline at end of file
}
......@@ -103,7 +103,7 @@ $form = pieform(array(
),
'fontfiles' => array(
'type' => 'fieldset',
'class' => 'individualfiles',
'class' => 'individualfiles form-condensed',
'legend' => get_string('fontfiles', 'skin'),
'elements' => array(
'fontfileEOT' => array(
......@@ -134,6 +134,7 @@ $form = pieform(array(
),
'submit' => array(
'type' => 'submitcancel',
'class' => 'btn-success',
'value' => array(get_string('installfont', 'skin'), get_string('cancel', 'mahara')),
'goto' => get_config('wwwroot') . 'admin/site/fonts.php',
),
......
......@@ -48,6 +48,7 @@ $form = pieform(array(
),
'submit' => array(
'type' => 'submitcancel',
'class'=> 'btn-success',
'value' => array(get_string('installgwfont', 'skin'), get_string('cancel', 'mahara')),
'goto' => get_config('wwwroot') . 'admin/site/fonts.php',
),
......
......@@ -36,7 +36,8 @@ $query = param_integer('query', null);
$previewform = pieform(array(
'name' => 'preview',
'renderer' => 'oneline',
'renderer' => 'div',
'class' => 'form-inline form-inline-align-bottom',
'elements' => array(
'fontpreview' => array(
'type' => 'select',
......@@ -96,6 +97,7 @@ $previewform = pieform(array(
),
'submit' => array(
'type' => 'submit',
'class' => 'btn-default',
'value' => get_string('preview', 'skin')
)
)
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -116,6 +116,7 @@ label,
}
.form-group {
padding: 0;
border-bottom: 0px none;
}
&.form-inline-align-bottom .form-group{
vertical-align: bottom;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -186,3 +186,9 @@
.tag-type {
font-size: $font-size-large;
}
// reset the padding when the individual font file is collapsed in font install
.individualfiles.form-group {
padding: 0;
border-bottom: 0 none;
}
......@@ -122,6 +122,7 @@ label,
}
.form-group {
padding: 0;
border-bottom: 0px none;
}
&.form-inline-align-bottom .form-group{
vertical-align: bottom;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
{include file="header.tpl"}
<div class="rbuttons">
<form method="post" action="{$WWWROOT}admin/site/font/install.php">
<input class="submit btn btn-success" type="submit" value="{str tag=installfont section=skin}">
</form>
<form method="post" action="{$WWWROOT}admin/site/font/installgwf.php">
<input class="submit btn btn-success" type="submit" value="{str tag=installgwfont section=skin}">
</form>
</div>
<p>{str tag=sitefontsdescription section=skin}</p>
{$form|safe}
{if $sitefonts}
<div class="panel panel-body">
<div class="rbuttons">
<form method="post" action="{$WWWROOT}admin/site/font/install.php" class="btn-group">
<input class="submit btn btn-success" type="submit" value="{str tag=installfont section=skin}">
</form>
<form method="post" action="{$WWWROOT}admin/site/font/installgwf.php" class="btn-group">
<input class="submit btn btn-success" type="submit" value="{str tag=installgwfont section=skin}">
</form>
</div>
<p>{str tag=sitefontsdescription section=skin}</p>
{$form|safe}
{if $sitefonts}
{if $query}
<h2 id="searchresultsheading" class="accessible-hidden sr-only">{str tag=Results}</h2>
{/if}
<div id="fontlist" class="fullwidth listing">
{foreach from=$sitefonts item=font}
<div class="{cycle values='r0,r1'} listrow">
<h3 class="title">{$font.title}</h3>
<ul class="actionlist">
<li class="notbtn">{str tag="fonttype.$font.fonttype" section="skin"}</li>
{if $font.fonttype == 'google'}
<li><a class="btn-display" href="javascript:" onclick="window.open('http://www.google.com/webfonts/specimen/{$font.urlencode}','specimen','width=700,height=800,toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,copyhistory=yes,resizable=no')">{str tag="viewfontspecimen" section="skin"}<span class="accessible-hidden sr-only">{str tag=viewfontspecimenfor section=skin arg1=$font.title}</span></a></li>
{else}
<li><a class="btn-display" href="javascript:" onclick="window.open('{$WWWROOT}admin/site/font/specimen.php?font={$font.name}','specimen','width=700,height=800,toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,copyhistory=yes,resizable=no')">{str tag="viewfontspecimen" section="skin"}<span class="accessible-hidden sr-only">{str tag=viewfontspecimenfor section=skin arg1=$font.title}</span></a></li>
{/if}
{if $font.fonttype == 'site'}<li><a class="btn-edit" href="{$WWWROOT}admin/site/font/edit.php?font={$font.name}">{str tag="editproperties" section="skin"}<span class="accessible-hidden sr-only">{str tag=viewfontspecimenfor section=skin arg1=$font.title}</span></a></li>{/if}
{if $font.fonttype == 'site'}<li><a class="btn-add" href="{$WWWROOT}admin/site/font/add.php?font={$font.name}">{str tag="addfontvariant" section="skin"}<span class="accessible-hidden sr-only">{str tag=viewfontspecimenfor section=skin arg1=$font.title}</span></a></li>{/if}
<li><a class="btn-del" href="{$WWWROOT}admin/site/font/delete.php?font={$font.name}">{str tag=deletefont section=skin} <span class="accessible-hidden sr-only">{$font.title}</span></a></li>
</ul>
<div style="font-family:'{$font.title|escape_css_string}';font-size:{$size}pt;line-height:{$size}pt;padding:3px 0;">
{if $preview == 10}{$font.title}{/if}
{if $preview >= 11}{str tag="sampletext$preview" section="skin"}{/if}
</div>
<div class="cb"></div>
<div id="fontlist" class="fullwidth listing">
{foreach from=$sitefonts item=font}
<div class="{cycle values='r0,r1'} listrow">
<h3 class="title">{$font.title}</h3>
<ul class="actionlist">
<li class="notbtn">{str tag="fonttype.$font.fonttype" section="skin"}</li>
{if $font.fonttype == 'google'}
<li>
<a class="btn-display" href="javascript:" onclick="window.open('http://www.google.com/webfonts/specimen/{$font.urlencode}','specimen','width=700,height=800,toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,copyhistory=yes,resizable=no')">
{str tag="viewfontspecimen" section="skin"}
<span class="accessible-hidden sr-only">
{str tag=viewfontspecimenfor section=skin arg1=$font.title}
</span>
</a>
</li>
{else}
<li>
<a class="btn-display" href="javascript:" onclick="window.open('{$WWWROOT}admin/site/font/specimen.php?font={$font.name}','specimen','width=700,height=800,toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,copyhistory=yes,resizable=no')">
{str tag="viewfontspecimen" section="skin"}
<span class="accessible-hidden sr-only">
{str tag=viewfontspecimenfor section=skin arg1=$font.title}
</span>
</a>
</li>
{/if}
{if $font.fonttype == 'site'}
<li>
<a class="btn-edit" href="{$WWWROOT}admin/site/font/edit.php?font={$font.name}">
{str tag="editproperties" section="skin"}
<span class="accessible-hidden sr-only">
{str tag=viewfontspecimenfor section=skin arg1=$font.title}
</span>
</a>
</li>
{/if}
{if $font.fonttype == 'site'}
<li>
<a class="btn-add" href="{$WWWROOT}admin/site/font/add.php?font={$font.name}">
{str tag="addfontvariant" section="skin"}
<span class="accessible-hidden sr-only">
{str tag=viewfontspecimenfor section=skin arg1=$font.title}
</span>
</a>
</li>
{/if}
<li>
<a class="btn-del" href="{$WWWROOT}admin/site/font/delete.php?font={$font.name}">
{str tag=deletefont section=skin}
<span class="accessible-hidden sr-only">
{$font.title}
</span>
</a>
</li>
</ul>
<div style="font-family:'{$font.title|escape_css_string}';font-size:{$size}pt;line-height:{$size}pt;padding:3px 0;">
{if $preview == 10}
{$font.title}
{/if}
{if $preview >= 11}
{str tag="sampletext$preview" section="skin"}
{/if}
</div>
{/foreach}
</div>
{else}
<div class="message">{str tag="nofonts" section="skin"}</div>
{/if}
<div class="cb"></div>
</div>
{/foreach}
</div>
{else}
<div class="message">
{str tag="nofonts" section="skin"}
</div>
{/if}
</div>
{$pagination|safe}
{include file="footer.tpl"}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment