Skip to content

Commit

Permalink
Added support for Adobe Edge WebFonts
Browse files Browse the repository at this point in the history
  • Loading branch information
@dziudek
dziudek committed Oct 23, 2012
1 parent ea21ab9 commit 7011419
Show file tree
Hide file tree
Showing 8 changed files with 167 additions and 35 deletions.
5 changes: 5 additions & 0 deletions meet_gavern/admin/elements/gkfont.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ protected function getInput() {
$options_type = array(
JHTML::_('select.option', 'standard', 'Standard'),
JHTML::_('select.option', 'google', 'Google Fonts'),
JHTML::_('select.option', 'edge', 'Adobe Edge Fonts'),
JHTML::_('select.option', 'squirrel', 'Squirrel')
);

Expand Down Expand Up @@ -65,6 +66,10 @@ protected function getInput() {
$html .= '<input type="text" name="'.$this->name.'" id="'.$this->id.'" class="gkFormHide" value="' . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '"/>';
$html .= '<span class="gk-label" id="'.str_replace(array('[', ']'), '', $this->name).'_google_own_link_label"><strong>'.JText::_('TPL_GK_LANG_OWN_GOOGLE_FONT_LINK').'</strong><input type="text" id="'.str_replace(array('[', ']'), '', $this->name).'_google_own_link" size="40" /></span>';
$html .= '<span class="gk-label" id="'.str_replace(array('[', ']'), '', $this->name).'_google_own_font_label"><strong>'.JText::_('TPL_GK_LANG_OWN_GOOGLE_FONT_FAMILY').'</strong><input type="text" id="'.str_replace(array('[', ']'), '', $this->name).'_google_own_font" size="40" /></span>';

$html .= '<span class="gk-label" id="'.str_replace(array('[', ']'), '', $this->name).'_edge_own_link_label"><strong>'.JText::_('TPL_GK_LANG_OWN_EDGE_FONT_LINK').'</strong><input type="text" id="'.str_replace(array('[', ']'), '', $this->name).'_edge_own_link" size="40" /></span>';
$html .= '<span class="gk-label" id="'.str_replace(array('[', ']'), '', $this->name).'_edge_own_font_label"><strong>'.JText::_('TPL_GK_LANG_OWN_EDGE_FONT_FAMILY').'</strong><input type="text" id="'.str_replace(array('[', ']'), '', $this->name).'_edge_own_font" size="40" /></span>';

$html .= '</div>';

return $html;
Expand Down
112 changes: 110 additions & 2 deletions meet_gavern/admin/scripts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,40 @@ jQuery(window).load(function(){
jQuery('#' + base_id + '_google_own_font').fadeOut();
jQuery('#' + base_id + '_google_own_link_label').fadeOut();
jQuery('#' + base_id + '_google_own_font_label').fadeOut();
jQuery('#' + base_id + '_edge_own_link').fadeOut();
jQuery('#' + base_id + '_edge_own_font').fadeOut();
jQuery('#' + base_id + '_edge_own_link_label').fadeOut();
jQuery('#' + base_id + '_edge_own_font_label').fadeOut();
jQuery('#' + base_id + '_squirrel').fadeOut();
} else if(values[0] == 'google') {
jQuery('#' + base_id + '_google_own_link').attr('value', values[2]);
jQuery('#' + base_id + '_google_own_font').attr('value', values[3]);
jQuery('#' + base_id + '_normal').fadeOut();
jQuery('#' + base_id + '_squirrel').fadeOut();
jQuery('#' + base_id + '_edge_own_link').fadeOut();
jQuery('#' + base_id + '_edge_own_font').fadeOut();
jQuery('#' + base_id + '_edge_own_link_label').fadeOut();
jQuery('#' + base_id + '_edge_own_font_label').fadeOut();
} else if(values[0] == 'squirrel') {
jQuery('#' + base_id + '_squirrel').attr('value', values[1]);
jQuery('#' + base_id + '_normal').fadeOut();
jQuery('#' + base_id + '_google_own_link').fadeOut();
jQuery('#' + base_id + '_google_own_font').fadeOut();
jQuery('#' + base_id + '_google_own_link_label').fadeOut();
jQuery('#' + base_id + '_google_own_font_label').fadeOut();
jQuery('#' + base_id + '_edge_own_link').fadeOut();
jQuery('#' + base_id + '_edge_own_font').fadeOut();
jQuery('#' + base_id + '_edge_own_link_label').fadeOut();
jQuery('#' + base_id + '_edge_own_font_label').fadeOut();
} else if(values[0] == 'edge') {
jQuery('#' + base_id + '_edge_own_link').attr('value', values[2]);
jQuery('#' + base_id + '_edge_own_font').attr('value', values[3]);
jQuery('#' + base_id + '_normal').fadeOut();
jQuery('#' + base_id + '_squirrel').fadeOut();
jQuery('#' + base_id + '_google_own_link').fadeOut();
jQuery('#' + base_id + '_google_own_font').fadeOut();
jQuery('#' + base_id + '_google_own_link_label').fadeOut();
jQuery('#' + base_id + '_google_own_font_label').fadeOut();
}

jQuery('#' + base_id + '_type').change(function() {
Expand All @@ -52,6 +73,10 @@ jQuery(window).load(function(){
jQuery('#' + base_id + '_google_own_font').fadeOut();
jQuery('#' + base_id + '_google_own_link_label').fadeOut();
jQuery('#' + base_id + '_google_own_font_label').fadeOut();
jQuery('#' + base_id + '_edge_own_link').fadeOut();
jQuery('#' + base_id + '_edge_own_font').fadeOut();
jQuery('#' + base_id + '_edge_own_link_label').fadeOut();
jQuery('#' + base_id + '_edge_own_font_label').fadeOut();
jQuery('#' + base_id + '_squirrel').fadeOut();
} else if(jQuery('#' + base_id + '_type').val() == 'google') {
jQuery('#' + base_id + '_normal').fadeOut();
Expand All @@ -60,16 +85,36 @@ jQuery(window).load(function(){
jQuery('#' + base_id + '_google_own_font').trigger('change');
jQuery('#' + base_id + '_google_own_link_label').fadeIn();
jQuery('#' + base_id + '_google_own_font_label').fadeIn();
jQuery('#' + base_id + '_edge_own_link').fadeOut();
jQuery('#' + base_id + '_edge_own_font').fadeOut();
jQuery('#' + base_id + '_edge_own_link_label').fadeOut();
jQuery('#' + base_id + '_edge_own_font_label').fadeOut();
jQuery('#' + base_id + '_squirrel').fadeOut();
} else if(jQuery('#' + base_id + '_type').val() == 'squirrel') {
jQuery('#' + base_id + '_normal').fadeOut();
jQuery('#' + base_id + '_google_own_link').fadeOut();
jQuery('#' + base_id + '_google_own_font').fadeOut();
jQuery('#' + base_id + '_google_own_link_label').fadeOut();
jQuery('#' + base_id + '_google_own_font_label').fadeOut();
jQuery('#' + base_id + '_edge_own_link').fadeOut();
jQuery('#' + base_id + '_edge_own_font').fadeOut();
jQuery('#' + base_id + '_edge_own_link_label').fadeOut();
jQuery('#' + base_id + '_edge_own_font_label').fadeOut();
jQuery('#' + base_id + '_squirrel').fadeIn();
jQuery('#' + base_id + '_squirrel').trigger('change');
}
} else if(jQuery('#' + base_id + '_type').val() == 'edge') {
jQuery('#' + base_id + '_normal').fadeOut();
jQuery('#' + base_id + '_edge_own_link').fadeIn();
jQuery('#' + base_id + '_edge_own_font').fadeIn();
jQuery('#' + base_id + '_edge_own_font').trigger('change');
jQuery('#' + base_id + '_edge_own_link_label').fadeIn();
jQuery('#' + base_id + '_edge_own_font_label').fadeIn();
jQuery('#' + base_id + '_google_own_link').fadeOut();
jQuery('#' + base_id + '_google_own_font').fadeOut();
jQuery('#' + base_id + '_google_own_link_label').fadeOut();
jQuery('#' + base_id + '_google_own_font_label').fadeOut();
jQuery('#' + base_id + '_squirrel').fadeOut();
}
});
jQuery('#' + base_id + '_type').blur(function() {
var values = (base_el.val()).split(';');
Expand All @@ -81,6 +126,10 @@ jQuery(window).load(function(){
jQuery('#' + base_id + '_google_own_font').fadeOut();
jQuery('#' + base_id + '_google_own_link_label').fadeOut();
jQuery('#' + base_id + '_google_own_font_label').fadeOut();
jQuery('#' + base_id + '_edge_own_link').fadeOut();
jQuery('#' + base_id + '_edge_own_font').fadeOut();
jQuery('#' + base_id + '_edge_own_link_label').fadeOut();
jQuery('#' + base_id + '_edge_own_font_label').fadeOut();
jQuery('#' + base_id + '_squirrel').css('display', 'none');
} else if(jQuery('#' + base_id + '_type').val() == 'google') {
jQuery('#' + base_id + '_normal').fadeOut();
Expand All @@ -89,15 +138,35 @@ jQuery(window).load(function(){
jQuery('#' + base_id + '_google_own_font').trigger('change');
jQuery('#' + base_id + '_google_own_link_label').fadeIn();
jQuery('#' + base_id + '_google_own_font_label').fadeIn();
jQuery('#' + base_id + '_edge_own_link').fadeOut();
jQuery('#' + base_id + '_edge_own_font').fadeOut();
jQuery('#' + base_id + '_edge_own_link_label').fadeOut();
jQuery('#' + base_id + '_edge_own_font_label').fadeOut();
jQuery('#' + base_id + '_squirrel').css('display', 'none');
} else if(jQuery('#' + base_id + '_type').val() == 'squirrel') {
jQuery('#' + base_id + '_normal').fadeOut();
jQuery('#' + base_id + '_google_own_link').fadeOut();
jQuery('#' + base_id + '_google_own_font').fadeOut();
jQuery('#' + base_id + '_google_own_link_label').fadeOut();
jQuery('#' + base_id + '_google_own_font_label').fadeOut();
jQuery('#' + base_id + '_edge_own_link').fadeOut();
jQuery('#' + base_id + '_edge_own_font').fadeOut();
jQuery('#' + base_id + '_edge_own_link_label').fadeOut();
jQuery('#' + base_id + '_edge_own_font_label').fadeOut();
jQuery('#' + base_id + '_squirrel').fadeIn();
jQuery('#' + base_id + '_squirrel').trigger('change');
} else if(jQuery('#' + base_id + '_type').val() == 'edge') {
jQuery('#' + base_id + '_normal').fadeOut();
jQuery('#' + base_id + '_edge_own_link').fadeIn();
jQuery('#' + base_id + '_edge_own_font').fadeIn();
jQuery('#' + base_id + '_edge_own_font').trigger('change');
jQuery('#' + base_id + '_edge_own_link_label').fadeIn();
jQuery('#' + base_id + '_edge_own_font_label').fadeIn();
jQuery('#' + base_id + '_google_own_link').fadeOut();
jQuery('#' + base_id + '_google_own_font').fadeOut();
jQuery('#' + base_id + '_google_own_link_label').fadeOut();
jQuery('#' + base_id + '_google_own_font_label').fadeOut();
jQuery('#' + base_id + '_squirrel').css('display', 'none');
}
});

Expand Down Expand Up @@ -145,6 +214,45 @@ jQuery(window).load(function(){
jQuery('#' + base_id + '_google_own_font').val()
);
});


jQuery('#' + base_id + '_edge_own_link').keydown(function() {
base_el.attr(
'value',
jQuery('#' + base_id + '_type').val() + ';' +
'own;' +
jQuery('#' + base_id + '_edge_own_link').val() + ';' +
jQuery('#' + base_id + '_edge_own_font').val()
);
});
jQuery('#' + base_id + '_edge_own_link').blur(function() {
base_el.attr(
'value',
jQuery('#' + base_id + '_type').val() + ';' +
'own;' +
jQuery('#' + base_id + '_edge_own_link').val() + ';' +
jQuery('#' + base_id + '_edge_own_font').val()
);
});

jQuery('#' + base_id + '_edge_own_font').keydown(function() {
base_el.attr(
'value',
jQuery('#' + base_id + '_type').val() + ';' +
'own;' +
jQuery('#' + base_id + '_edge_own_link').val() + ';' +
jQuery('#' + base_id + '_edge_own_font').val()
);
});
jQuery('#' + base_id + '_edge_own_font').blur(function() {
base_el.attr(
'value',
jQuery('#' + base_id + '_type').val() + ';' +
'own;' +
jQuery('#' + base_id + '_edge_own_link').val() + ';' +
jQuery('#' + base_id + '_edge_own_font').val()
);
});


jQuery('#' + base_id + '_squirrel').change(function() {
Expand All @@ -157,7 +265,7 @@ jQuery(window).load(function(){
// function to generate the updates list
function getUpdates() {
jQuery('#jform_params_template_updates-lbl').remove(); // remove unnecesary label
var update_url = 'https://www.gavick.com/updates/json/tmpl,component/query,product/product,gk_meet_gavern_j30';
var update_url = 'https://www.gavick.com/updates/json/tmpl,component/query,product/product,gk_creative_j16';
var update_div = jQuery('#gk_template_updates');
update_div.html('<div id="gk_update_div"><span id="gk_loader"></span>Loading update data from GavicPro Update service...</div>');

Expand Down
4 changes: 3 additions & 1 deletion meet_gavern/css/template.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
body {
color:#777;
font:normal 13px/24px Arial, Verdana, sans-serif !important;
font-size: 13px;
font-weight: normal;
line-height: 24px;
}
a {
color:#5990de;
Expand Down
4 changes: 4 additions & 0 deletions meet_gavern/language/en-GB/en-GB.tpl_meet_gavern.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ TPL_GK_LANG_CONTACT_WEBMASTER="Contact Webmaster"
COM_TEMPLATES_FONT_SETTINGS_FIELDSET_LABEL="Fonts"
TPL_GK_LANG_GOOGLE_FONTS_URL="Google Font Directory"
TPL_GK_LANG_GOOGLE_FONTS_URL_DESC="You can preview on linked website available fonts"
TPL_GK_LANG_EDGE_FONTS_URL="Adobe Edge Font Directory"
TPL_GK_LANG_EDGE_FONTS_URL_DESC="You can preview on linked website available fonts"
TPL_GK_LANG_SQUIRREL_FONTS_URL="Squirrel font kits"
TPL_GK_LANG_SQUIRREL_FONTS_URL_DESC="You can preview on linked website available fonts"
TPL_GK_LANG_CLICK_HERE="Click here"
Expand All @@ -101,6 +103,8 @@ TPL_GK_LANG_FONT_RULES_G4_DESC="You can specify a selectors for font used in the
TPL_GK_LANG_OWN_GOOGLE_FONT="- - - Own - - -"
TPL_GK_LANG_OWN_GOOGLE_FONT_LINK="Font url: "
TPL_GK_LANG_OWN_GOOGLE_FONT_FAMILY="Font family: "
TPL_GK_LANG_OWN_EDGE_FONT_LINK="Font url: "
TPL_GK_LANG_OWN_EDGE_FONT_FAMILY="Font family: "


COM_TEMPLATES_FEATURES_SETTINGS_FIELDSET_LABEL="Features"
Expand Down
4 changes: 4 additions & 0 deletions meet_gavern/language/pl-PL/pl-PL.tpl_meet_gavern.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ TPL_GK_LANG_CONTACT_WEBMASTER="Kontakt z webmasterem"
COM_TEMPLATES_FONT_SETTINGS_FIELDSET_LABEL="Czcionki"
TPL_GK_LANG_GOOGLE_FONTS_URL="Katalog fontów Google"
TPL_GK_LANG_GOOGLE_FONTS_URL_DESC="Podgląd dostępnych czcionek znajduje się na podlinkowanej stronie"
TPL_GK_LANG_EDGE_FONTS_URL="Katlog fontów Adobe Edge"
TPL_GK_LANG_EDGE_FONTS_URL_DESC="Podgląd dostępnych czcionek znajduje się na podlinkowanej stronie"
TPL_GK_LANG_SQUIRREL_FONTS_URL="Squirrel font"
TPL_GK_LANG_SQUIRREL_FONTS_URL_DESC="Podgląd dostępnych czcionek znajduje się na podlinkowanej stronie"
TPL_GK_LANG_CLICK_HERE="Kliknij tutaj"
Expand All @@ -102,6 +104,8 @@ TPL_GK_LANG_FONT_RULES_G4_DESC="Określa selektory dla czcionki innych elementó
TPL_GK_LANG_OWN_GOOGLE_FONT="- - - Własny - - -"
TPL_GK_LANG_OWN_GOOGLE_FONT_LINK="URL czcionki: "
TPL_GK_LANG_OWN_GOOGLE_FONT_FAMILY="Rodzina czcionek: "
TPL_GK_LANG_OWN_EDGE_FONT_LINK="URL czcionki: "
TPL_GK_LANG_OWN_EDGE_FONT_FAMILY="Rodzina czcionek: "


COM_TEMPLATES_FEATURES_SETTINGS_FIELDSET_LABEL="Dodatki"
Expand Down
8 changes: 7 additions & 1 deletion meet_gavern/layouts/blocks/head.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,13 @@
} elseif($font_type == 'squirrel') {
$this->API->addCSS($this->API->URLtemplate() . '/fonts/' . $font_name . '/stylesheet.css');
$this->API->addCSSRule($this->API->get('font_rules_group'.$font_iter, '') . ' { font-family: ' . $font_name . ', Arial, sans-serif; }'."\n");
}
} elseif($font_type == 'edge') {
$font_link = $font_data[2];
$font_family = $font_data[3];

$this->API->addJS($font_link);
$this->API->addCSSRule($this->API->get('font_rules_group'.$font_iter, '') . ' { font-family: ' . $font_family . ', sans-serif; }'."\n");
}
}
}

Expand Down
6 changes: 4 additions & 2 deletions meet_gavern/less/template.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
@page: 'normal';

body {
color: #777;
font: normal 13px/24px Arial, Verdana, sans-serif !important; /* ToDo */
color:#777;
font-size: 13px;
font-weight: normal;
line-height: 24px;
}

a {
Expand Down
59 changes: 30 additions & 29 deletions meet_gavern/templateDetails.xml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE install PUBLIC "-//Joomla! 2.5//DTD template 1.0//EN" "http://www.joomla.org/xml/dtd/2.5/template-install.dtd">
<extension version="3.0" type="template" client="site" method="upgrade">
<name>meet_gavern</name>
<version>1.0</version>
<creationDate>07/02/2012</creationDate>
<author>GavickPro</author>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE install PUBLIC "-//Joomla! 2.5//DTD template 1.0//EN" "http://www.joomla.org/xml/dtd/2.5/template-install.dtd">
<extension version="3.0" type="template" client="site" method="upgrade">
<name>meet_gavern</name>
<version>1.0</version>
<creationDate>07/02/2012</creationDate>
<author>GavickPro</author>
<authorEmail>info@gavick.com</authorEmail>
<copyright>Copyright (C) 2012 GavickPro. All rights reserved.</copyright>
<copyright>Copyright (C) 2012 GavickPro. All rights reserved.</copyright>
<description><![CDATA[<link rel="stylesheet" type="text/css" href="../templates/meet_gavern/admin/style.css" />
<style type="text/css" media="all">
<!--
Expand Down Expand Up @@ -39,30 +39,30 @@
<p class="livedemo">View Meet Gavern template in action <a href="http://joomla30.gavick.com" target="_blank">here</a>...</p><small>Gavern v.4.0</small></div>
</div>
</div>]]></description>
<files>
</div>]]></description>
<files>
<filename>component.php</filename>
<filename>error.php</filename>
<filename>favicon.ico</filename>
<filename>index.php</filename>
<filename>LICENSE.txt</filename>
<filename>offline.php</filename>
<filename>templateDetails.xml</filename>
<filename>template_preview.png</filename>
<filename>templateDetails.xml</filename>
<filename>template_preview.png</filename>
<filename>template_thumbnail.png</filename>
<folder>admin</folder>
<folder>bootstrap</folder>
<folder>config</folder>
<folder>css</folder>
<folder>config</folder>
<folder>css</folder>
<folder>html</folder>
<folder>fonts</folder>
<folder>fonts</folder>
<folder>images</folder>
<folder>js</folder>
<folder>language</folder>
<folder>layouts</folder>
<folder>less</folder>
<folder>lib</folder>
</files>
<folder>lib</folder>
</files>
<positions>
<position>debug</position>
<position>menu</position>
Expand All @@ -76,13 +76,13 @@
<position>mainbody_top</position>
<position>mainbody_bottom</position>
<position>bottom</position>
<position>footer</position>
</positions>
<languages folder="language">
<language tag="en-GB">en-GB/en-GB.tpl_meet_gavern.ini</language>
</languages>
<config>
<fields name="params">
<position>footer</position>
</positions>
<languages folder="language">
<language tag="en-GB">en-GB/en-GB.tpl_meet_gavern.ini</language>
</languages>
<config>
<fields name="params">
<fieldset name="BASIC_SETTINGS" addfieldpath="/templates/meet_gavern/admin/elements">
<field name="config_manager" type="configmanager" directory="templates/meet_gavern/config/" />
<field name="js_translations" type="translations" />
Expand Down Expand Up @@ -119,13 +119,14 @@
<option value="8">TPL_GK_LANG_SPAN8</option>
<option value="9">TPL_GK_LANG_SPAN9</option>
<option value="10">TPL_GK_LANG_SPAN10</option>
</field>
</field>
</fieldset>

<!-- Font settings -->
<fieldset name="FONT_SETTINGS" addfieldpath="/templates/meet_gavern/admin/elements">
<field name="font_link1" type="url" label="TPL_GK_LANG_GOOGLE_FONTS_URL" description="TPL_GK_LANG_GOOGLE_FONTS_URL_DESC" url="http://code.google.com/webfonts" text="TPL_GK_LANG_CLICK_HERE" />
<field name="font_link2" type="url" label="TPL_GK_LANG_SQUIRREL_FONTS_URL" description="TPL_GK_LANG_SQUIRREL_FONTS_URL_DESC" url="http://www.fontsquirrel.com/fontface" text="TPL_GK_LANG_CLICK_HERE" />
<field name="font_link3" type="url" label="TPL_GK_LANG_EDGE_FONTS_URL" description="TPL_GK_LANG_EDGE_FONTS_URL_DESC" url="http://html.adobe.com/edge/webfonts/" text="TPL_GK_LANG_CLICK_HERE" />
<field name="gk_line_20" type="line" text="" />
<field name="font_name_group1" type="gkfont" directory="templates/meet_gavern/fonts/" label="TPL_GK_LANG_FONT_NAME_G1" description="TPL_GK_LANG_FONT_NAME_G1_DESC" />
<field name="font_rules_group1" type="textarea" rows="6" cols="40" label="TPL_GK_LANG_FONT_RULES_G1" description="TPL_GK_LANG_FONT_RULES_G1_DESC" />
Expand Down Expand Up @@ -394,7 +395,7 @@
<!-- Updates -->
<fieldset name="UPDATES" addfieldpath="/templates/meet_gavern/admin/elements">
<field name="template_updates" type="update" />
</fieldset>
</fields>
</config>
</extension>
</fieldset>
</fields>
</config>
</extension>

0 comments on commit 7011419

Please sign in to comment.