Commit 58a74cd3 authored by Sigrid Suski's avatar Sigrid Suski

default4 template removed; default5 now default template

parent 0241ce35
......@@ -481,7 +481,7 @@ VALUES ( 'allowed_attributes_array',
( 'show_intro', '1', 1, 0, 'category' ),
( 'show_pb', '1', 0, 0, 'general' ),
( 'subcats', '1', 1, 0, 'list' ),
( 'template', 'default4', 1, 0, 'section' ),
( 'template', 'default5', 1, 0, 'section' ),
( 'top_menu', '1', 1, 0, 'general' ),
( 'vat', '7', 0, 0, 'payments' ),
( 'vat_brutto', '1', 0, 0, 'payments' ),
......
......@@ -33,6 +33,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
### 1.5 ()
(!) Default template is now default5
(+) Implementation of Font Awesome 5 (free version)
......
......@@ -39,5 +39,5 @@ abstract class SPC
const GLOBAL_SETTING = 2;
const SHOW = 1;
const NO = 0;
const DEFAULT_TEMPLATE = 'default4';
const DEFAULT_TEMPLATE = 'default5';
}
......@@ -381,7 +381,7 @@ abstract class SPFrontView extends SPObject implements SPView
SPConfig::debOut( "Memory: {$mem}<br/>Time: {$time}<br/> Queries: {$queries}" );
}
$templateName = Sobi::Cfg( 'section.template' );
echo "\n<!-- Start of SobiPro component 1.4.x -->\n<div id=\"SobiPro\" class=\"SobiPro {$templateName}\">\n{$out}\n</div>\n<!-- End of SobiPro component; Copyright (C) 2011-2019 Sigsiu.NET GmbH -->\n";
echo "\n<!-- Start of SobiPro component 1.5.x -->\n<div id=\"SobiPro\" class=\"SobiPro {$templateName}\">\n{$out}\n</div>\n<!-- End of SobiPro component; Copyright (C) 2011-2019 Sigsiu.NET GmbH -->\n";
}
else {
$this->customOutput( $out );
......
This diff is collapsed.
......@@ -90,7 +90,7 @@
<xsl:if test="$entry/state = 'unpublished'">
<a tabindex="0" role="button" class="entry-status" data-toggle="popover" data-trigger="focus"
data-content="{php:function( 'SobiPro::Txt', 'CATEGORY_STATUS_UNPUBLISHED' )}" title="">
<i class="icon-ban-circle"/>
<i class="fa fa-remove-sign"/>
</a>
</xsl:if>
</xsl:template>
......
......@@ -71,7 +71,7 @@
<xsl:if test="$fieldname/@required = 1 and //config/required-star/@value = 1">
<sup>
<span class="star">
<i class="icon-star"></i>
<i class="fa fa-star"></i>
</span>
</sup>
</xsl:if>
......
......@@ -25,15 +25,15 @@
<xsl:value-of select="//config/basefont/@value"/>
</xsl:variable>
<xsl:if test="//config/basefont/@value != 'none' and //config/basefont/@value != ''">
<xsl:value-of select="php:function( 'tplDefault4::LoadFont', $basefont)"/>
<xsl:value-of select="php:function( 'tplDefault4::ApplyBaseFont', $basefont)"/>
<xsl:value-of select="php:function( 'tplDefault5::LoadFont', $basefont)"/>
<xsl:value-of select="php:function( 'tplDefault5::ApplyBaseFont', $basefont)"/>
</xsl:if>
<xsl:variable name="specialfont">
<xsl:value-of select="//config/specialfont/@value"/>
</xsl:variable>
<xsl:if test="$basefont != $specialfont and //config/specialfont/@value != '' and //config/specialfont/@value != 'none'">
<xsl:value-of select="php:function( 'tplDefault4::LoadFont', $specialfont)"/>
<xsl:value-of select="php:function( 'tplDefault4::ApplyFont', $specialfont)"/>
<xsl:value-of select="php:function( 'tplDefault5::LoadFont', $specialfont)"/>
<xsl:value-of select="php:function( 'tplDefault5::ApplyFont', $specialfont)"/>
</xsl:if>
</xsl:template>
......
......@@ -22,7 +22,7 @@
<xsl:if test="entry/approve_url or entry/edit_url or entry/publish_url or entry/delete_url">
<div class="btn-group spManage pull-left">
<a class="btn btn-sigsiu dropdown-toggle btn-sm" data-toggle="dropdown" data-role="button" href="#">
<i class="icon-edit"/>
<i class="fa fa-edit"/>
</a>
<ul class="dropdown-menu">
<xsl:if test="entry/publish_url">
......@@ -70,19 +70,19 @@
<xsl:if test="$entry/approved = 0">
<a tabindex="0" role="button" class="entry-status" data-toggle="popover" data-trigger="focus"
data-content="{php:function( 'SobiPro::Txt', 'ENTRY_STATUS_UNAPPROVED' )}" title="">
<i class="icon-thumbs-down-alt"/>
<i class="fa fa-thumbs-down"/>
</a>
</xsl:if>
<xsl:if test="$entry/state = 'unpublished'">
<a tabindex="0" role="button" class="entry-status" data-toggle="popover" data-trigger="focus"
data-content="{php:function( 'SobiPro::Txt', 'ENTRY_STATUS_UNPUBLISHED' )}" title="">
<i class="icon-ban-circle"/>
<i class="fa fa-times-circle"/>
</a>
</xsl:if>
<xsl:if test="$entry/state = 'expired'">
<a tabindex="0" role="button" class="entry-status" data-toggle="popover" data-trigger="focus"
data-content="{php:function( 'SobiPro::Txt', 'ENTRY_STATUS_EXPIRED' )}" title="">
<i class="icon-warning-sign"/>
<i class="fa fa-warning"/>
</a>
</xsl:if>
</xsl:template>
......
......@@ -138,7 +138,7 @@
</xsl:attribute>
</xsl:if>
<div class="spNoImage">
<i class="icon icon-ban-circle"></i>
<i class="fa fa-ban"></i>
</div>
</div>
</xsl:if>
......
......@@ -58,9 +58,7 @@
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#topmenu" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"/>
<span class="icon-bar"/>
<span class="icon-bar"/>
<span class="fa fa-bars"/>
</button>
</div>
<div id="topmenu" class="collapse navbar-collapse">
......@@ -95,7 +93,7 @@
</xsl:if>
</xsl:otherwise>
</xsl:choose>
<span class="icon-th-list" aria-hidden="true"/>
<span class="fa fa-th-list" aria-hidden="true"></span>
<xsl:text> </xsl:text>
<xsl:value-of select="//menu/front"/>
</a>
......@@ -110,7 +108,7 @@
<xsl:attribute name="class">active</xsl:attribute>
<span class="sr-only">(current)</span>
</xsl:if>
<span class="icon-plus-sign" aria-hidden="true"/>
<span class="fa fa-plus-circle" aria-hidden="true"></span>
<xsl:text> </xsl:text>
<xsl:value-of select="//menu/add"/>
</a>
......@@ -120,7 +118,7 @@
<xsl:if test="string-length(//config/redirectlogin/@value) > 0">
<li role="none">
<a href="{//config/redirectlogin/@value}" role="menuitem">
<span class="icon-plus-sign" aria-hidden="true"/>
<span class="fa fa-plus-circle" aria-hidden="true"></span>
<xsl:text> </xsl:text>
<xsl:value-of select="php:function( 'SobiPro::Txt', 'MN.ADD_ENTRY' )"/>
</a>
......@@ -136,7 +134,7 @@
<xsl:attribute name="class">active</xsl:attribute>
<span class="sr-only">(current)</span>
</xsl:if>
<span class="icon-search" aria-hidden="true"/>
<span class="fa fa-search" aria-hidden="true"></span>
<xsl:text> </xsl:text>
<xsl:value-of select="//menu/search"/>
</a>
......
......@@ -14,7 +14,6 @@
; This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
[general]
template_type = "xslt"
css_files = "theme,custom"
......
This diff is collapsed.
......@@ -318,7 +318,7 @@ body.modal-open {
// Styles in this scope concerns also SobiPro modules
// ----------------------------------------
.SobiPro.default4 {
.SobiPro.default5 {
font-size: @fontsize;
-moz-osx-font-smoothing: grayscale;
......@@ -3607,6 +3607,10 @@ body.modal-open {
margin-bottom: 8px;
}
.spEntryEdit .col-sm-offset-2 {
margin-left: 0;
}
.input-mini,
.input-small,
.input-medium,
......
......@@ -110,7 +110,7 @@
</xsl:when>
<xsl:otherwise>
<div class="review-first">
<i class="icon icon-exclamation-sign icon-large"></i>
<i class="fa fa-exclamation-circle fa-lg"></i>
<xsl:text> </xsl:text>
<xsl:value-of select="php:function( 'SobiPro::Txt', 'ENTRY_NO_REVIEWS_NO_ADD', string(entry/name) )"/>
</div>
......
......@@ -53,7 +53,7 @@
<div class="required-message">
<sup>
<span class="star">
<i class="icon-star"></i>
<i class="fa fa-star"></i>
</span>
</sup>
<xsl:value-of select="php:function( 'SobiPro::Txt', 'ENTRY_REQUIRED_MESSAGE' )"/>
......
......@@ -23,13 +23,3 @@ SobiPro.jQuery( document ).ready( function () {
SobiPro.jQuery( window ).trigger( 'resize' )
} );
} );
// SobiPro.jQuery( document ).ready( function ()
// // {
// // SobiPro.jQuery('div[id ^= "field_markers"]').css('display','none');
// // SobiPro.jQuery('#field_category').change(function()
// // {
// // var selected = 'id' + SobiPro.jQuery('#field_category').val() + '-png';
// // SobiPro.jQuery('#field_markers').val(selected);
// // });
// // });
\ No newline at end of file
{
"general": {},
"upload-field": {
"search-button": "fa fa-eye",
"remove-button": "fa fa-remove"
},
"calendar-field": {
"select-button": "fa fa-th",
"now-icon": "fa fa-check",
"time-icon": "fa fa-clock-o",
"calendar-icon": "fa fa-calendar",
"reset-icon": "fa fa-minus-circle",
"increase-icon": "fa fa-chevron-up",
"decrease-icon": "fa fa-chevron-down"
},
"category-field": {
"spinner": "fa fa-spinner fa-spin"
},
"select-field": {
"spinner": "fa fa-spinner fa-spin"
}
}
......@@ -22,4 +22,4 @@ js_files = "alpha,navigation,bootstrap.b3typeahead,autosuggest,search"
[form]
action = "index.php"
method = "post"
id = "spSearchForm"
id = "SPSearchForm"
......@@ -25,7 +25,7 @@
defined( 'SOBIPRO' ) || exit( 'Restricted access' );
abstract class tplDefault4
abstract class tplDefault5
{
public static function Cfg( $key, $def = null, $section = 'general' )
......@@ -49,12 +49,12 @@ abstract class tplDefault4
public static function ApplyBaseFont( $name )
{
SPFactory::header()->addCSSCode( ".SobiPro.default4 {font-family:'" . $name . "', sans serif;}" );
SPFactory::header()->addCSSCode( ".SobiPro.default5 {font-family:'" . $name . "', sans serif;}" );
}
public static function ApplyFont( $name )
{
SPFactory::header()->addCSSCode( ".SobiPro.default4 h1, .SobiPro.default4 h2, .SobiPro.default4 h3, .SobiPro.default4 h4 {font-family:'" . $name . "', sans serif;}" );
SPFactory::header()->addCSSCode( ".SobiPro.default5 h1, .SobiPro.default5 h2, .SobiPro.default5 h3, .SobiPro.default5 h4 {font-family:'" . $name . "', sans serif;}" );
}
/**
......
<?xml version="1.0" encoding="UTF-8"?>
<template xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://xml.sigsiu.net/SobiPro/template.xsd">
<name>Default Template V4</name>
<id>default4</id>
<name>Default Template V5 B3</name>
<id>default5</id>
<authorName>Sigrid Suski and Radek Suski</authorName>
<authorEmail>sobi[at]sigsiu.net</authorEmail>
<authorUrl>http://www.Sigsiu.NET</authorUrl>
<copyright>Copyright (C) 2006-2019 Sigsiu.NET GmbH</copyright>
<license>GNU General Public License</license>
<creationDate>2019-01-31</creationDate>
<version>4.3</version>
<creationDate>2019-03-13</creationDate>
<version>5.0</version>
<description>Default Template for SobiPro 1.4+ with Bootstrap 3 support.
This template makes use of Bootstrap 3 and Font Awesome 3 elements and styles.
</description>
......
......@@ -19,8 +19,6 @@
defined( '_JEXEC' ) || exit( 'Restricted access' );
define( 'SOBI_FRAMEWORK_VERSION', '1.0.9' );
/**
* Class com_sobiproInstallerScript
*/
......@@ -73,11 +71,12 @@ class com_sobiproInstallerScript
/**
* Called on update
*
* @param JAdapterInstance $adapter The object responsible for running this script
*
* @return boolean True on success
* @param JAdapterInstance $adapter
*
* @return bool
* @throws SPException
* @throws \Sobi\Error\Exception
*/
public function update( JAdapterInstance $adapter )
// public function update( $parent )
......@@ -446,7 +445,7 @@ class com_sobiproInstallerScript
catch ( Exception $x ) {
}
JFile::move( JPATH_ROOT . '/components/com_sobipro/etc/repos/sobipro_core/repository.1.4.xml', JPATH_ROOT . '/components/com_sobipro/etc/repos/sobipro_core/repository.xml' );
JFile::move( JPATH_ROOT . '/components/com_sobipro/etc/repos/sobipro_core/repository.1.5.xml', JPATH_ROOT . '/components/com_sobipro/etc/repos/sobipro_core/repository.xml' );
$this->installFramework();
......@@ -494,7 +493,7 @@ class com_sobiproInstallerScript
// if ( file_exists( implode( '/', [ JPATH_ROOT, 'components', 'com_sobipro', 'media' ] ) ) ) {
// JFolder::delete( implode( '/', [ JPATH_ROOT, 'components', 'com_sobipro', 'media' ] ) );
// }
JFile::move( JPATH_ROOT . '/components/com_sobipro/etc/repos/sobipro_core/repository.1.4.xml', JPATH_ROOT . '/components/com_sobipro/etc/repos/sobipro_core/repository.xml' );
JFile::move( JPATH_ROOT . '/components/com_sobipro/etc/repos/sobipro_core/repository.1.5.xml', JPATH_ROOT . '/components/com_sobipro/etc/repos/sobipro_core/repository.xml' );
$db = JFactory::getDBO();
$db->setQuery( 'SHOW COLUMNS FROM #__sobipro_field_data' );
$cols = $db->loadAssocList( 'Field' );
......
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