Skip to content
Browse files

Style Updates

  • Loading branch information...
1 parent c16783a commit fb54e91297e6cc389646e77fb856f99336c4608c @antonydoyle committed Sep 28, 2012
View
14 css/templateCore.css
@@ -37,16 +37,19 @@ article header {
display:inline-block;
}
.article-meta {
- width:240px;
+
+}
+.article-footer ul {
+ list-style:none;
+}
+dl.article-info {
+ width:240px;
background: none repeat scroll 0 0 #F2F2F2;
border: 1px solid #E6E6E6;
margin: 0 0 22px;
padding: 20px;
float:right;
}
-.article-footer ul {
- list-style:none;
-}
.article-info dt {
font-weight:bold;
font-size:1.6rem;
@@ -56,6 +59,9 @@ article header {
.article-info dd {
margin-bottom:3px;
}
+ul.category {
+ list-style:none;
+}
.pagenav {
list-style:none;
}
View
2 html/com_content/article/default.php
@@ -51,7 +51,7 @@
<?php endif; ?>
<?php if ($canEdit || $params->get('show_print_icon') || $params->get('show_email_icon')) : ?>
<section class="actions">
- <ul>
+ <ul class="link-list">
<?php if (!$this->print) : ?>
<?php if ($params->get('show_print_icon')) : ?>
<li class="print-icon">
View
64 html/com_content/category/blog_item.php
@@ -19,21 +19,7 @@
JHtml::_('behavior.framework');
?>
- <?php if ($params->get('show_print_icon') || $params->get('show_email_icon') || $canEdit) : ?>
- <div class="btn-group pull-right"> <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> <i class="icon-cog"></i> <span class="caret"></span> </a>
- <ul class="dropdown-menu">
- <?php if ($params->get('show_print_icon')) : ?>
- <li class="print-icon"> <?php echo JHtml::_('icon.print_popup', $this->item, $params); ?> </li>
- <?php endif; ?>
- <?php if ($params->get('show_email_icon')) : ?>
- <li class="email-icon"> <?php echo JHtml::_('icon.email', $this->item, $params); ?> </li>
- <?php endif; ?>
- <?php if ($canEdit) : ?>
- <li class="edit-icon"> <?php echo JHtml::_('icon.edit', $this->item, $params); ?> </li>
- <?php endif; ?>
- </ul>
- </div>
- <?php endif; ?>
+
<?php if ($params->get('show_title') || $this->item->state == 0 || ($params->get('show_author') && !empty($this->item->author ))) : ?>
<div class="page-header">
<?php if ($params->get('show_title')) : ?>
@@ -50,30 +36,16 @@
<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
<?php endif; ?>
- <?php if ($params->get('show_author') && !empty($this->item->author )) : ?>
- <small class="createdby">
- <?php $author = $this->item->author; ?>
- <?php $author = ($this->item->created_by_alias ? $this->item->created_by_alias : $author); ?>
- <?php if (!empty($this->item->contactid ) && $params->get('link_author') == true) : ?>
- <?php
- echo JText::sprintf(
- 'COM_CONTENT_WRITTEN_BY',
- JHtml::_('link', JRoute::_('index.php?option=com_contact&view=contact&id='.$this->item->contactid), $author)
- ); ?>
- <?php else :?>
- <?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
- <?php endif; ?>
- </small>
- <?php endif; ?>
+
</div>
<?php endif; ?>
<?php // to do not that elegant would be nice to group the params ?>
<?php $useDefList = (($params->get('show_modify_date')) or ($params->get('show_publish_date'))
or ($params->get('show_hits'))); ?>
<?php if ($useDefList AND ($info == 0 OR $info == 2)) : ?>
- <div class="article-info muted">
<dl class="article-info">
+
<dt class="article-info-term"><?php echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?></dt>
<?php if ($params->get('show_parent_category') && !empty($this->item->parent_slug)) : ?>
@@ -135,8 +107,35 @@
</dd>
<?php endif; ?>
<?php endif; ?>
+ <?php if ($params->get('show_author') && !empty($this->item->author )) : ?>
+ <small class="createdby">
+ <?php $author = $this->item->author; ?>
+ <?php $author = ($this->item->created_by_alias ? $this->item->created_by_alias : $author); ?>
+ <?php if (!empty($this->item->contactid ) && $params->get('link_author') == true) : ?>
+ <?php
+ echo JText::sprintf(
+ 'COM_CONTENT_WRITTEN_BY',
+ JHtml::_('link', JRoute::_('index.php?option=com_contact&view=contact&id='.$this->item->contactid), $author)
+ ); ?>
+ <?php else :?>
+ <?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+ <?php endif; ?>
+ </small>
+ <?php endif; ?>
+ <?php if ($params->get('show_print_icon') || $params->get('show_email_icon') || $canEdit) : ?>
+ <ul class="link-list">
+ <?php if ($params->get('show_print_icon')) : ?>
+ <li class="print-icon"> <?php echo JHtml::_('icon.print_popup', $this->item, $params); ?> </li>
+ <?php endif; ?>
+ <?php if ($params->get('show_email_icon')) : ?>
+ <li class="email-icon"> <?php echo JHtml::_('icon.email', $this->item, $params); ?> </li>
+ <?php endif; ?>
+ <?php if ($canEdit) : ?>
+ <li class="edit-icon"> <?php echo JHtml::_('icon.edit', $this->item, $params); ?> </li>
+ <?php endif; ?>
+ </ul>
+ <?php endif; ?>
</dl>
- </div>
<?php endif; ?>
<?php if (!$params->get('show_intro')) : ?>
@@ -156,6 +155,7 @@
<?php if ($useDefList AND ($info == 1 OR $info == 2)) : ?>
<div class="article-info muted">
+
<dl class="article-info">
<dt class="article-info-term"><?php echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?></dt>
View
54 html/com_weblinks/categories/default.php
@@ -1,38 +1,40 @@
-<?php defined('_JEXEC') or die;
+<?php
/**
- * @package Template Framework for Joomla!+
- * @author Cristina Solana http://nightshiftcreative.com
- * @author Matt Thomas http://construct-framework.com | http://betweenbrain.com
- * @copyright Copyright (C) 2009 - 2012 Matt Thomas. All rights reserved.
- * @license GNU/GPL v2 or later http://www.gnu.org/licenses/gpl-2.0.html
+ * @package Joomla.Site
+ * @subpackage com_weblinks
+ *
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
*/
-JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers');
?>
-<section class="categories-list<?php echo $this->pageclass_sfx;?>">
-<?php if ($this->params->get('show_page_heading', 1)) : ?>
+<div class="categories-list<?php echo $this->pageclass_sfx;?>">
+<?php if ($this->params->get('show_page_heading')) : ?>
<h1>
- <?php echo htmlspecialchars($this->params->get('page_heading')); ?>
+ <?php echo $this->escape($this->params->get('page_heading')); ?>
</h1>
- <?php endif; ?>
+<?php endif; ?>
<?php if ($this->params->get('show_base_description')) : ?>
- <?php //If there is a description in the menu parameters use that; ?>
- <?php if ($this->params->get('categories_description')) : ?>
- <p class="category-desc base-desc">
- <?php echo JHtml::_('content.prepare', $this->params->get('categories_description'), '', 'com_weblinks.categories'); ?>
- </p>
- <?php else: ?>
- <?php //Otherwise get one from the database if it exists. ?>
- <?php if ($this->parent->description) : ?>
- <section class="category-desc base-desc">
- <?php echo JHtml::_('content.prepare', $this->parent->description, '', 'com_weblinks.categories'); ?>
- <?php endif; ?>
- <?php endif; ?>
- <?php endif; ?>
+ <?php //If there is a description in the menu parameters use that; ?>
+ <?php if($this->params->get('categories_description')) : ?>
+ <div class="category-desc base-desc">
+ <?php echo JHtml::_('content.prepare', $this->params->get('categories_description'), '', 'com_weblinks.categories'); ?>
+ </div>
+ <?php else: ?>
+ <?php //Otherwise get one from the database if it exists. ?>
+ <?php if ($this->parent->description) : ?>
+ <div class="category-desc base-desc">
+ <?php echo JHtml::_('content.prepare', $this->parent->description, '', 'com_weblinks.categories'); ?>
+ </div>
+ <?php endif; ?>
+ <?php endif; ?>
+ <?php endif; ?>
<?php
echo $this->loadTemplate('items');
?>
-</section>
-
+</div>
View
231 html/com_weblinks/categories/default.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+ <layout title="com_weblinks_categories_view_default_title" option="com_weblinks_categories_view_default_option">
+ <help
+ key="JHELP_MENUS_MENU_ITEM_WEBLINK_CATEGORIES"
+ />
+ <message>
+ <![CDATA[com_weblinks_categories_view_default_desc]]>
+ </message>
+ </layout>
+
+ <!-- Add fields to the request variables for the layout. -->
+ <fields name="request">
+ <fieldset name="request"
+ >
+ <field name="id" type="category"
+ description="JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_DESC"
+ extension="com_weblinks"
+ label="JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_LABEL"
+ show_root="true"
+ required="true"
+ />
+ </fieldset>
+ </fields>
+
+ <!-- Add fields to the parameters object for the layout. -->
+<fields name="params">
+<fieldset name="basic" label="JGLOBAL_CATEGORIES_OPTIONS">
+
+ <field name="show_base_description" type="list"
+ label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
+ description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="categories_description" type="textarea"
+ description="JGLOBAL_FIELD_CATEGORIES_DESC_DESC"
+ label="JGLOBAL_FIELD_CATEGORIES_DESC_LABEL"
+ cols="25"
+ rows="5"
+ />
+
+ <field name="maxLevelcat" type="list"
+ default="-1"
+ description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+ label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="-1">JALL</option>
+ <option value="1">J1</option>
+ <option value="2">J2</option>
+ <option value="3">J3</option>
+ <option value="4">J4</option>
+ <option value="5">J5</option>
+
+ </field>
+
+ <field name="show_empty_categories_cat" type="list"
+ label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+ description="COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_subcat_desc_cat" type="list"
+ description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+ label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_cat_num_links_cat" type="list"
+ description="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC"
+ label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ </fieldset>
+
+ <fieldset name="category" label="JGLOBAL_CATEGORY_OPTIONS">
+ <field name="spacer1" type="spacer" class="text"
+ label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+ />
+
+ <field name="show_category_title" type="list"
+ label="JGLOBAL_SHOW_CATEGORY_TITLE"
+ description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_description" type="list"
+ description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
+ label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_description_image" type="list"
+ description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
+ label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="maxLevel" type="list"
+ description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+ label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JNONE</option>
+ <option value="-1">JALL</option>
+ <option value="1">J1</option>
+ <option value="2">J2</option>
+ <option value="3">J3</option>
+ <option value="4">J4</option>
+ <option value="5">J5</option>
+
+ </field>
+
+ <field name="show_empty_categories" type="list"
+ label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+ description="COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_subcat_desc" type="list"
+ description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+ label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_cat_num_links" type="list"
+ description="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC"
+ label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ </fieldset>
+
+ <fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS">
+ <field name="spacer2" type="spacer" class="text"
+ label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+ />
+ <field name="show_pagination_limit" type="list"
+ label="JGLOBAL_DISPLAY_SELECT_LABEL"
+ description="JGLOBAL_DISPLAY_SELECT_DESC">
+
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_headings" type="list"
+ description="JGLOBAL_SHOW_HEADINGS_DESC"
+ label="JGLOBAL_SHOW_HEADINGS_LABEL"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_link_description" type="list"
+
+ description="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_DESC"
+ label="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_LABEL"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_link_hits" type="list"
+
+ description="COM_WEBLINKS_FIELD_CONFIG_HITS_DESC"
+ label="JGLOBAL_HITS"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+
+ </field>
+
+ <field name="show_pagination" type="list"
+ description="JGLOBAL_PAGINATION_DESC"
+ label="JGLOBAL_PAGINATION_LABEL"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ <option value="2">JGLOBAL_AUTO</option>
+ </field>
+
+ <field name="show_pagination_results" type="list"
+
+ label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+ description="JGLOBAL_PAGINATION_RESULTS_DESC">
+
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+ </fieldset>
+
+</fields>
+</metadata>
View
98 html/com_weblinks/categories/default_items.php
@@ -1,56 +1,56 @@
-<?php defined('_JEXEC') or die;
-
+<?php
/**
- * @version $Id: default_items.php 21097 2011-04-07 15:38:03Z dextercowley $
- * @package Joomla.Site
- * @subpackage com_weblinks
- * @copyright Copyright (C) 2005 - 2011 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE.txt
+ * @package Joomla.Site
+ * @subpackage com_weblinks
+ *
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
*/
-$class = ' class="first"';
+defined('_JEXEC') or die;
-if (count($this->items[$this->parent->id]) > 0 && $this->maxLevelcat != 0) : ?>
-<ol>
- <?php foreach ($this->items[$this->parent->id] as $id => $item) : ?>
- <?php
- if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) :
- if (!isset($this->items[$this->parent->id][$id + 1])) {
- $class = ' class="last"';
- }
- ?>
- <li<?php echo $class; ?>>
- <?php $class = ''; ?>
- <span class="item-title"><a href="<?php echo JRoute::_(WeblinksHelperRoute::getCategoryRoute($item->id));?>">
- <?php echo htmlspecialchars($item->title); ?></a>
- </span>
- <?php if ($this->params->get('show_subcat_desc_cat') == 1) : ?>
- <?php if ($item->description) : ?>
- <p class="category-desc">
- <?php echo JHtml::_('content.prepare', $item->description, '', 'com_weblinks.categories'); ?>
- </p>
- <?php endif; ?>
- <?php endif; ?>
- <?php if ($this->params->get('show_cat_num_links_cat') == 1) : ?>
- <dl class="weblink-count">
- <dt>
- <?php echo JText::_('COM_WEBLINKS_NUM'); ?></dt>
- <dd><?php echo $item->numitems; ?></dd>
- </dl>
- <?php endif; ?>
+$class = ' class="first"';
+if (count($this->items[$this->parent->id]) > 0 && $this->maxLevelcat != 0) :
+?>
+<ul>
+<?php foreach($this->items[$this->parent->id] as $id => $item) : ?>
+ <?php
+ if($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) :
+ if(!isset($this->items[$this->parent->id][$id + 1]))
+ {
+ $class = ' class="last"';
+ }
+ ?>
+ <li<?php echo $class; ?>>
+ <?php $class = ''; ?>
+ <span class="item-title"><a href="<?php echo JRoute::_(WeblinksHelperRoute::getCategoryRoute($item->id));?>">
+ <?php echo $this->escape($item->title); ?></a>
+ </span>
+ <?php if ($this->params->get('show_subcat_desc_cat') == 1) :?>
+ <?php if ($item->description) : ?>
+ <div class="category-desc">
+ <?php echo JHtml::_('content.prepare', $item->description, '', 'com_weblinks.categories'); ?>
+ </div>
+ <?php endif; ?>
+ <?php endif; ?>
+ <?php if ($this->params->get('show_cat_num_links_cat') == 1) :?>
+ <dl class="weblink-count"><dt>
+ <?php echo JText::_('COM_WEBLINKS_NUM'); ?></dt>
+ <dd><?php echo $item->numitems; ?></dd>
+ </dl>
+ <?php endif; ?>
- <?php if (count($item->getChildren()) > 0) :
- $this->items[$item->id] = $item->getChildren();
- $this->parent = $item;
- $this->maxLevelcat--;
- echo $this->loadTemplate('items');
- $this->parent = $item->getParent();
- $this->maxLevelcat++;
- endif; ?>
+ <?php if(count($item->getChildren()) > 0) :
+ $this->items[$item->id] = $item->getChildren();
+ $this->parent = $item;
+ $this->maxLevelcat--;
+ echo $this->loadTemplate('items');
+ $this->parent = $item->getParent();
+ $this->maxLevelcat++;
+ endif; ?>
- </li>
- <?php endif; ?>
- <?php endforeach; ?>
-</ol>
+ </li>
+ <?php endif; ?>
+<?php endforeach; ?>
+</ul>
<?php endif; ?>
-
View
4 html/com_weblinks/categories/index.html
@@ -1,3 +1 @@
-<html>
-<body bgcolor="#FFFFFF"></body>
-</html>
+<!DOCTYPE html><title></title>
View
77 html/com_weblinks/category/default.php
@@ -1,44 +1,43 @@
-<?php defined('_JEXEC') or die;
+<?php
/**
- * @package Template Framework for Joomla!+
- * @author Cristina Solana http://nightshiftcreative.com
- * @author Matt Thomas http://construct-framework.com | http://betweenbrain.com
- * @copyright Copyright (C) 2009 - 2012 Matt Thomas. All rights reserved.
- * @license GNU/GPL v2 or later http://www.gnu.org/licenses/gpl-2.0.html
+ * @package Joomla.Site
+ * @subpackage com_weblinks
+ *
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
*/
-JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+defined('_JEXEC') or die;
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers');
?>
-<section class="weblink-category<?php echo $this->pageclass_sfx;?>">
- <?php if ($this->params->get('show_page_heading', 1)) : ?>
- <h1>
- <?php echo htmlspecialchars($this->params->get('page_heading')); ?>
- </h1>
- <?php endif; ?>
- <?php if ($this->params->get('show_category_title', 1)) : ?>
- <h2>
- <?php echo JHtml::_('content.prepare', $this->category->title, '', 'com_weblinks.category'); ?>
- </h2>
- <?php endif; ?>
- <?php if ($this->params->get('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
- <section class="category-desc clearfix">
- <?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
- <img src="<?php echo $this->category->getParams()->get('image'); ?>" />
- <?php endif; ?>
- <?php if ($this->params->get('show_description') && $this->category->description) : ?>
- <?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_weblinks.category'); ?>
- <?php endif; ?>
- </section>
- <?php endif; ?>
- <?php echo $this->loadTemplate('items'); ?>
- <?php if (!empty($this->children[$this->category->id]) && $this->maxLevel != 0) : ?>
- <section class="cat-children">
- <h3>
- <?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?>
- </h3>
- <?php echo $this->loadTemplate('children'); ?>
- </section>
- <?php endif; ?>
-</section>
-
+<div class="weblink-category<?php echo $this->pageclass_sfx;?>">
+<?php if ($this->params->get('show_page_heading')) : ?>
+<h1>
+ <?php echo $this->escape($this->params->get('page_heading')); ?>
+</h1>
+<?php endif; ?>
+<?php if($this->params->get('show_category_title', 1)) : ?>
+<h2>
+ <?php echo JHtml::_('content.prepare', $this->category->title, '', 'com_weblinks.category'); ?>
+</h2>
+<?php endif; ?>
+<?php if ($this->params->get('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
+ <div class="category-desc">
+ <?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
+ <img src="<?php echo $this->category->getParams()->get('image'); ?>"/>
+ <?php endif; ?>
+ <?php if ($this->params->get('show_description') && $this->category->description) : ?>
+ <?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_weblinks.category'); ?>
+ <?php endif; ?>
+ <div class="clr"></div>
+ </div>
+<?php endif; ?>
+<?php echo $this->loadTemplate('items'); ?>
+<?php if (!empty($this->children[$this->category->id])&& $this->maxLevel != 0) : ?>
+ <div class="cat-children">
+ <h3><?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?></h3>
+ <?php echo $this->loadTemplate('children'); ?>
+ </div>
+<?php endif; ?>
+</div>
View
183 html/com_weblinks/category/default.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+ <layout title="com_weblinks_category_view_default_title" option="com_weblinks_category_view_default_option">
+ <help
+ key="JHELP_MENUS_MENU_ITEM_WEBLINK_CATEGORY"
+ />
+ <message>
+ <![CDATA[com_weblinks_category_view_default_desc]]>
+ </message>
+ </layout>
+
+ <!-- Add fields to the request variables for the layout. -->
+ <fields name="request">
+ <fieldset name="request">
+
+ <field name="id" type="category"
+ default="0"
+ description="COM_WEBLINKS_FIELD_SELECT_CATEGORY_DESC"
+ extension="com_weblinks"
+ label="COM_WEBLINKS_FIELD_SELECT_CATEGORY_LABEL"
+ required="true"
+ />
+ </fieldset>
+ </fields>
+
+ <!-- Add fields to the parameters object for the layout. -->
+<fields name="params">
+<fieldset name="basic" label="JGLOBAL_CATEGORY_OPTIONS">
+ <field name="spacer1" type="spacer" class="text"
+ label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+ />
+
+ <field name="show_category_title" type="list"
+ label="JGLOBAL_SHOW_CATEGORY_TITLE"
+ description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_description" type="list"
+ description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
+ label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_description_image" type="list"
+ description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
+ label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="maxLevel" type="list"
+ description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+ label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JNONE</option>
+ <option value="-1">JALL</option>
+ <option value="1">J1</option>
+ <option value="2">J2</option>
+ <option value="3">J3</option>
+ <option value="4">J4</option>
+ <option value="5">J5</option>
+
+ </field>
+
+ <field name="show_empty_categories" type="list"
+ label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+ description="COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_subcat_desc" type="list"
+ description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+ label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_cat_num_links" type="list"
+ description="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC"
+ label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ </fieldset>
+
+ <fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS">
+ <field name="spacer2" type="spacer" class="text"
+ label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+ />
+
+ <field name="show_pagination_limit" type="list"
+ label="JGLOBAL_DISPLAY_SELECT_LABEL"
+ description="JGLOBAL_DISPLAY_SELECT_DESC">
+
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_headings" type="list"
+ description="JGLOBAL_SHOW_HEADINGS_DESC"
+ label="JGLOBAL_SHOW_HEADINGS_LABEL"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_link_description" type="list"
+
+ description="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_DESC"
+ label="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_LABEL"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ <field name="show_link_hits" type="list"
+
+ description="COM_WEBLINKS_FIELD_CONFIG_HITS_DESC"
+ label="JGLOBAL_HITS"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+
+ </field>
+
+ <field name="show_pagination" type="list"
+ description="JGLOBAL_PAGINATION_DESC"
+ label="JGLOBAL_PAGINATION_LABEL"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ <option value="2">JGLOBAL_AUTO</option>
+ </field>
+
+ <field name="show_pagination_results" type="list"
+
+ label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+ description="JGLOBAL_PAGINATION_RESULTS_DESC">
+
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+ </fieldset>
+
+ <fieldset name="integration"
+ >
+
+ <field name="show_feed_link" type="list"
+ description="JGLOBAL_SHOW_FEED_LINK_DESC"
+ label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+ >
+ <option value="">JGLOBAL_USE_GLOBAL</option>
+ <option value="0">JHIDE</option>
+ <option value="1">JSHOW</option>
+ </field>
+
+ </fieldset>
+</fields>
+</metadata>
View
57 html/com_weblinks/category/default_children.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @package Joomla.Site
+ * @subpackage com_weblinks
+ *
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$class = ' class="first"';
+if (count($this->children[$this->category->id]) > 0 && $this->maxLevel != 0) :
+?>
+<ul>
+<?php foreach($this->children[$this->category->id] as $id => $child) : ?>
+ <?php
+ if($this->params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) :
+ if(!isset($this->children[$this->category->id][$id + 1]))
+ {
+ $class = ' class="last"';
+ }
+ ?>
+ <li<?php echo $class; ?>>
+ <?php $class = ''; ?>
+ <span class="item-title"><a href="<?php echo JRoute::_(WeblinksHelperRoute::getCategoryRoute($child->id));?>">
+ <?php echo $this->escape($child->title); ?></a>
+ </span>
+
+ <?php if ($this->params->get('show_subcat_desc') == 1) :?>
+ <?php if ($child->description) : ?>
+ <div class="category-desc">
+ <?php echo JHtml::_('content.prepare', $child->description, '', 'com_weblinks.category'); ?>
+ </div>
+ <?php endif; ?>
+ <?php endif; ?>
+
+ <?php if ($this->params->get('show_cat_num_links') == 1) :?>
+ <dl class="weblink-count"><dt>
+ <?php echo JText::_('COM_WEBLINKS_NUM'); ?></dt>
+ <dd><?php echo $child->numitems; ?></dd>
+ </dl>
+ <?php endif; ?>
+
+ <?php if(count($child->getChildren()) > 0 ) :
+ $this->children[$child->id] = $child->getChildren();
+ $this->category = $child;
+ $this->maxLevel--;
+ echo $this->loadTemplate('children');
+ $this->category = $child->getParent();
+ $this->maxLevel++;
+ endif; ?>
+ </li>
+ <?php endif; ?>
+ <?php endforeach; ?>
+ </ul>
+<?php endif;
View
271 html/com_weblinks/category/default_items.php
@@ -1,18 +1,20 @@
-<?php defined('_JEXEC') or die;
+<?php
/**
- * @package Template Framework for Joomla!+
- * @author Cristina Solana http://nightshiftcreative.com
- * @author Matt Thomas http://construct-framework.com | http://betweenbrain.com
- * @copyright Copyright (C) 2009 - 2012 Matt Thomas. All rights reserved.
- * @license GNU/GPL v2 or later http://www.gnu.org/licenses/gpl-2.0.html
+ * @package Joomla.Site
+ * @subpackage com_weblinks
+ *
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
*/
+defined('_JEXEC') or die;
+
// Code to support edit links for weblinks
// Create a shortcut for params.
$params = &$this->item->params;
-JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
JHtml::_('behavior.tooltip');
-JHtml::core();
+JHtml::_('behavior.framework');
// Get the user object.
$user = JFactory::getUser();
@@ -22,141 +24,128 @@
$canEditState = $user->authorise('core.edit.state', 'com_weblinks');
$n = count($this->items);
-$listOrder = $this->escape($this->state->get('list.ordering'));
-$listDirn = $this->escape($this->state->get('list.direction'));
-
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn = $this->escape($this->state->get('list.direction'));
?>
+
<?php if (empty($this->items)) : ?>
-<p> <?php echo JText::_('COM_WEBLINKS_NO_WEBLINKS'); ?></p>
+ <p> <?php echo JText::_('COM_WEBLINKS_NO_WEBLINKS'); ?></p>
<?php else : ?>
-<form action="<?php echo htmlspecialchars(JFactory::getURI()->toString()); ?>" method="post" name="adminForm" id="adminForm">
- <?php if ($this->params->get('show_pagination_limit')) : ?>
- <fieldset class="filters">
- <legend class="hidelabeltxt">
- <?php echo JText::_('JGLOBAL_FILTER_LABEL'); ?>
- </legend>
- <div class="display-limit">
- <?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>&#160;
- <?php echo $this->pagination->getLimitBox(); ?>
- </div>
- <input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
- <input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
- </fieldset>
- <?php endif; ?>
-
- <table class="category">
- <?php if ($this->params->get('show_headings') == 1) : ?>
- <thead>
- <tr>
- <th class="title">
- <?php echo JHtml::_('grid.sort', 'COM_WEBLINKS_GRID_TITLE', 'title', $listDirn, $listOrder); ?>
- </th>
- <?php if ($this->params->get('show_link_hits')) : ?>
- <th class="hits">
- <?php echo JHtml::_('grid.sort', 'JGLOBAL_HITS', 'hits', $listDirn, $listOrder); ?>
- </th>
- <?php endif; ?>
- </tr>
- </thead>
- <?php endif; ?>
-
- <tbody>
- <?php foreach ($this->items as $i => $item) : ?>
- <?php if ($this->items[$i]->state == 0) : ?>
- <tr class="system-unpublished cat-list-row<?php echo $i % 2; ?>">
- <?php else: ?>
- <tr class="cat-list-row<?php echo $i % 2; ?>">
- <?php endif; ?>
-
- <td class="title">
- <p>
- <?php if ($this->params->get('icons') == 0) : ?>
- <?php echo JText::_('COM_WEBLINKS_LINK'); ?>
- <?php elseif ($this->params->get('icons') == 1) : ?>
- <?php if (!$this->params->get('link_icons')) : ?>
- <?php echo JHtml::_('image', 'system/' . $this->params->get('link_icons', 'weblink.png'), JText::_('COM_WEBLINKS_LINK'), NULL, true); ?>
- <?php else: ?>
- <?php echo '<img src="' . $this->params->get('link_icons') . '" alt="' . JText::_('COM_WEBLINKS_LINK') . '" />'; ?>
- <?php endif; ?>
- <?php endif; ?>
- <?php
- // Compute the correct link
- $menuclass = 'category' . $this->pageclass_sfx;
- $link = $item->link;
- $width = $item->params->get('width');
- $height = $item->params->get('height');
- if ($width == null || $height == null) {
- $width = 600;
- $height = 500;
- }
-
- switch ($item->params->get('target', $this->params->get('target'))) {
- case 1:
- // open in a new window
- echo '<a href="' . $link . '" target="_blank" class="' . $menuclass . '" rel="nofollow">' .
- $this->escape($item->title) . '</a>';
- break;
-
- case 2:
- // open in a popup window
- $attribs = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=' . $this->escape($width) . ',height=' . $this->escape($height) . '';
- echo "<a href=\"$link\" onclick=\"window.open(this.href, 'targetWindow', '" . $attribs . "'); return false;\">" .
- $this->escape($item->title) . '</a>';
- break;
- case 3:
- // open in a modal window
- JHtml::_('behavior.modal', 'a.modal'); ?>
- <a class="modal" href="<?php echo $link;?>" rel="{handler: 'iframe', size: {x:<?php echo htmlspecialchars($width);?>, y:<?php echo htmlspecialchars($height);?>}}">
- <?php echo htmlspecialchars($item->title) . ' </a>';
- break;
-
- default:
- // open in parent window
- echo '<a href="' . $link . '" class="' . $menuclass . '" rel="nofollow">' .
- $this->escape($item->title) . ' </a>';
- break;
- }
- ?>
- <?php // Code to add the edit link for the weblink. ?>
-
- <?php if ($canEdit) : ?>
- <ul class="actions">
- <li class="edit-icon">
- <?php echo JHtml::_('icon.edit', $item, $params); ?>
- </li>
- </ul>
- <?php endif; ?>
- </p>
-
- <?php if (($this->params->get('show_link_description')) AND ($item->description != '')): ?>
- <?php echo $item->description; ?>
- <?php endif; ?>
- </td>
- <?php if ($this->params->get('show_link_hits')) : ?>
- <td class="hits">
- <?php echo $item->hits; ?>
- </td>
- <?php endif; ?>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
-
- <?php // Code to add a link to submit a weblink. ?>
- <?php /* if ($canCreate) : // TODO This is not working due to some problem in the router, I think. Ref issue #23685 ?>
- <?php echo JHtml::_('icon.create', $item, $item->params); ?>
- <?php endif; */ ?>
- <?php if ($this->params->get('show_pagination')) : ?>
- <nav class="pagination">
- <?php if ($this->params->def('show_pagination_results', 1)) : ?>
- <p class="counter">
- <?php echo $this->pagination->getPagesCounter(); ?>
- </p>
- <?php endif; ?>
- <?php echo $this->pagination->getPagesLinks(); ?>
- </nav>
- <?php endif; ?>
-</form>
-<?php endif;
+<form action="<?php echo htmlspecialchars(JUri::getInstance()->toString()); ?>" method="post" name="adminForm" id="adminForm">
+ <?php if ($this->params->get('filter_field') != 'hide') :?>
+ <div class="btn-group">
+ <label class="filter-search-lbl element-invisible" for="filter-search"><span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span><?php echo JText::_('COM_WEBLINKS_'.$this->params->get('filter_field').'_FILTER_LABEL').'&#160;'; ?></label>
+ <input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo JText::_('COM_WEBLINKS_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo JText::_('COM_WEBLINKS_FILTER_SEARCH_DESC'); ?>" />
+ </div>
+ <?php endif; ?>
+
+ <?php if ($this->params->get('show_pagination_limit')) : ?>
+ <div class="display-limit">
+ <?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>&#160;
+ <?php echo $this->pagination->getLimitBox(); ?>
+ </div>
+ <?php endif; ?>
+
+ <?php if ($this->params->get('filter_field') != 'hide') :?>
+ </fieldset>
+ <?php endif; ?>
+ <ul class="category list-striped list-condensed">
+
+ <?php foreach ($this->items as $i => $item) : ?>
+ <?php if (in_array($item->access, $this->user->getAuthorisedViewLevels())) : ?>
+ <?php if ($this->items[$i]->state == 0) : ?>
+ <li class="system-unpublished cat-list-row<?php echo $i % 2; ?>">
+ <?php else: ?>
+ <li class="cat-list-row<?php echo $i % 2; ?>" >
+ <?php endif; ?>
+ <?php if ($this->params->get('list_show_hits', 1)) : ?>
+ <span class="list-hits badge badge-info pull-right">
+ <?php echo JText::sprintf('JGLOBAL_HITS_COUNT', $item->hits); ?>
+ </span>
+ <?php endif; ?>
+
+ <?php if ($canEdit) : ?>
+ <span class="list-edit pull-left width-50">
+ <?php echo JHtml::_('icon.edit', $item, $params); ?>
+ </span>
+ <?php endif; ?>
+
+ <strong class="list-title">
+ <?php if ($this->params->get('icons') == 0) : ?>
+ <?php echo JText::_('COM_WEBLINKS_LINK'); ?>
+ <?php elseif ($this->params->get('icons') == 1) : ?>
+ <?php if (!$this->params->get('link_icons')) : ?>
+ <?php echo JHtml::_('image', 'system/'.$this->params->get('link_icons', 'weblink.png'), JText::_('COM_WEBLINKS_LINK'), null, true); ?>
+ <?php else: ?>
+ <?php echo '<img src="'.$this->params->get('link_icons').'" alt="'.JText::_('COM_WEBLINKS_LINK').'" />'; ?>
+ <?php endif; ?>
+ <?php endif; ?>
+ <?php
+ // Compute the correct link
+ $menuclass = 'category'.$this->pageclass_sfx;
+ $link = $item->link;
+ $width = $item->params->get('width');
+ $height = $item->params->get('height');
+ if ($width == null || $height == null) {
+ $width = 600;
+ $height = 500;
+ }
+ if ($this->items[$i]->state == 0): ?>
+ <span class="label label-warning">Unpublished</span>
+ <?php endif; ?>
+
+ <?php switch ($item->params->get('target', $this->params->get('target')))
+ {
+ case 1:
+ // open in a new window
+ echo '<a href="'. $link .'" target="_blank" class="'. $menuclass .'" rel="nofollow">'.
+ $this->escape($item->title) .'</a>';
+ break;
+
+ case 2:
+ // open in a popup window
+ $attribs = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width='.$this->escape($width).',height='.$this->escape($height).'';
+ echo "<a href=\"$link\" onclick=\"window.open(this.href, 'targetWindow', '".$attribs."'); return false;\">".
+ $this->escape($item->title).'</a>';
+ break;
+ case 3:
+ // open in a modal window
+ JHtml::_('behavior.modal', 'a.modal'); ?>
+ <a class="modal" href="<?php echo $link;?>" rel="{handler: 'iframe', size: {x:<?php echo $this->escape($width);?>, y:<?php echo $this->escape($height);?>}}">
+ <?php echo $this->escape($item->title). ' </a>';
+ break;
+
+ default:
+ // open in parent window
+ echo '<a href="'. $link . '" class="'. $menuclass .'" rel="nofollow">'.
+ $this->escape($item->title) . ' </a>';
+ break;
+ }
+ ?>
+ </strong>
+ <?php if (($this->params->get('show_link_description')) and ($item->description != '')): ?>
+ <?php echo $item->description; ?>
+ <?php endif; ?>
+
+ </li>
+ <?php endif;?>
+ <?php endforeach; ?>
+ </ul>
+ <?php // Code to add a link to submit a weblink. ?>
+ <?php /* if ($canCreate) : // TODO This is not working due to some problem in the router, I think. Ref issue #23685 ?>
+ <?php echo JHtml::_('icon.create', $item, $item->params); ?>
+ <?php endif; */ ?>
+ <?php if ($this->params->get('show_pagination')) : ?>
+ <div class="pagination">
+ <?php if ($this->params->def('show_pagination_results', 1)) : ?>
+ <p class="counter">
+ <?php echo $this->pagination->getPagesCounter(); ?>
+ </p>
+ <?php endif; ?>
+ <?php echo $this->pagination->getPagesLinks(); ?>
+ </div>
+ <?php endif; ?>
+ </form>
+<?php endif; ?>
View
4 html/com_weblinks/category/index.html
@@ -1,3 +1 @@
-<html>
-<body bgcolor="#FFFFFF"></body>
-</html>
+<!DOCTYPE html><title></title>
View
171 html/com_weblinks/form/edit.php
@@ -1,12 +1,14 @@
-<?php defined('_JEXEC') or die;
+<?php
/**
- * @version $Id: edit.php 21321 2011-05-11 01:05:59Z dextercowley $
- * @package Joomla.Site
- * @subpackage com_weblinks
- * @copyright Copyright (C) 2005 - 2011 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE.txt
+ * @package Joomla.Site
+ * @subpackage com_weblinks
+ *
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
*/
+defined('_JEXEC') or die;
+
JHtml::_('behavior.keepalive');
JHtml::_('behavior.tooltip');
JHtml::_('behavior.formvalidation');
@@ -16,71 +18,98 @@
?>
<script type="text/javascript">
- Joomla.submitbutton = function (task) {
- if (task == 'weblink.cancel' || document.formvalidator.isValid(document.id('adminForm'))) {
- <?php echo $this->form->getField('description')->save(); ?>
- Joomla.submitform(task);
- } else {
- alert('<?php echo htmlspecialchars(JText::_('JGLOBAL_VALIDATION_FORM_FAILED'));?>');
- }
- }
+ Joomla.submitbutton = function(task) {
+ if (task == 'weblink.cancel' || document.formvalidator.isValid(document.id('adminForm'))) {
+ <?php echo $this->form->getField('description')->save(); ?>
+ Joomla.submitform(task);
+ }
+ else {
+ alert('<?php echo $this->escape(JText::_('JGLOBAL_VALIDATION_FORM_FAILED'));?>');
+ }
+ }
</script>
+<div class="edit<?php echo $this->pageclass_sfx; ?>">
+ <?php if ($this->params->get('show_page_heading')) : ?>
+ <h1>
+ <?php echo $this->escape($this->params->get('page_heading')); ?>
+ </h1>
+ <?php endif; ?>
+ <form action="<?php echo JRoute::_('index.php?option=com_weblinks&view=form&w_id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate form-vertical">
+ <div class="btn-toolbar">
+ <div class="btn-group">
+ <button type="button" class="btn btn-primary" onclick="Joomla.submitbutton('weblink.save')">
+ <i class="icon-ok"></i> <?php echo JText::_('JSAVE') ?>
+ </button>
+ </div>
+ <div class="btn-group">
+ <button type="button" class="btn" onclick="Joomla.submitbutton('weblink.cancel')">
+ <i class="icon-cancel"></i> <?php echo JText::_('JCANCEL') ?>
+ </button>
+ </div>
+ </div>
-<section class="edit<?php echo $this->pageclass_sfx; ?>">
- <?php if ($this->params->get('show_page_heading', 1)) : ?>
- <h1>
- <?php echo htmlspecialchars($this->params->get('page_heading')); ?>
- </h1>
- <?php endif; ?>
- <form action="<?php echo JRoute::_('index.php?option=com_weblinks&view=form&w_id=' . (int)$this->item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate">
- <fieldset>
- <legend><?php echo JText::_('COM_WEBLINKS_LINK'); ?></legend>
-
- <div class="formelm">
- <?php echo $this->form->getLabel('title'); ?>
- <?php echo $this->form->getInput('title'); ?>
- </div>
-
- <div class="formelm">
- <?php echo $this->form->getLabel('alias'); ?>
- <?php echo $this->form->getInput('alias'); ?>
- </div>
-
- <div class="formelm">
- <?php echo $this->form->getLabel('catid'); ?>
- <?php echo $this->form->getInput('catid'); ?>
- </div>
- <div class="formelm">
- <?php echo $this->form->getLabel('url'); ?>
- <?php echo $this->form->getInput('url'); ?>
- </div>
- <?php if ($this->user->authorise('core.edit.state', 'com_weblinks.weblink')): ?>
- <div class="formelm">
- <?php echo $this->form->getLabel('state'); ?>
- <?php echo $this->form->getInput('state'); ?>
- </div>
- <?php endif; ?>
- <div class="formelm">
- <?php echo $this->form->getLabel('language'); ?>
- <?php echo $this->form->getInput('language'); ?>
- </div>
- <div class="formelm-buttons">
- <button type="button" onclick="Joomla.submitbutton('weblink.save')">
- <?php echo JText::_('JSAVE') ?>
- </button>
- <button type="button" onclick="Joomla.submitbutton('weblink.cancel')">
- <?php echo JText::_('JCANCEL') ?>
- </button>
- </div>
- <div>
- <?php echo $this->form->getLabel('description'); ?>
- <?php echo $this->form->getInput('description'); ?>
- </div>
- </fieldset>
-
- <input type="hidden" name="return" value="<?php echo $this->return_page;?>" />
- <input type="hidden" name="task" value="" />
- <?php echo JHtml::_('form.token'); ?>
- </form>
-</section>
+ <hr class="hr-condensed" />
+ <div class="control-group">
+ <div class="control-label">
+ <?php echo $this->form->getLabel('title'); ?>
+ </div>
+ <div class="controls">
+ <?php echo $this->form->getInput('title'); ?>
+ </div>
+ </div>
+ <div class="control-group">
+ <div class="control-label">
+ <?php echo $this->form->getLabel('alias'); ?>
+ </div>
+ <div class="controls">
+ <?php echo $this->form->getInput('alias'); ?>
+ </div>
+ </div>
+ <div class="control-group">
+ <div class="control-label">
+ <?php echo $this->form->getLabel('catid'); ?>
+ </div>
+ <div class="controls">
+ <?php echo $this->form->getInput('catid'); ?>
+ </div>
+ </div>
+ <div class="control-group">
+ <div class="control-label">
+ <?php echo $this->form->getLabel('url'); ?>
+ </div>
+ <div class="controls">
+ <?php echo $this->form->getInput('url'); ?>
+ </div>
+ </div>
+ <?php if ($this->user->authorise('core.edit.state', 'com_weblinks.weblink')): ?>
+ <div class="control-group">
+ <div class="control-label">
+ <?php echo $this->form->getLabel('state'); ?>
+ </div>
+ <div class="controls">
+ <?php echo $this->form->getInput('state'); ?>
+ </div>
+ </div>
+ <?php endif; ?>
+ <div class="control-group">
+ <div class="control-label">
+ <?php echo $this->form->getLabel('language'); ?>
+ </div>
+ <div class="controls">
+ <?php echo $this->form->getInput('language'); ?>
+ </div>
+ </div>
+ <div class="control-group">
+ <div class="control-label">
+ <?php echo $this->form->getLabel('description'); ?>
+ </div>
+ <div class="controls">
+ <?php echo $this->form->getInput('description'); ?>
+ </div>
+ </div>
+ <input type="hidden" name="return" value="<?php echo $this->return_page;?>" />
+ <input type="hidden" name="task" value="" />
+ <?php echo JHtml::_('form.token'); ?>
+ </form>
+</div>
View
12 html/com_weblinks/form/edit.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+ <layout
+ title="com_weblinks_form_view_default_title" option="com_weblinks_form_view_default_option">
+ <help
+ key="JHELP_MENUS_MENU_ITEM_WEBLINK_SUBMIT"
+ />
+ <message>
+ <![CDATA[com_weblinks_form_view_default_desc]]>
+ </message>
+ </layout>
+</metadata>
View
1 html/com_weblinks/form/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
View
4 html/com_weblinks/index.html
@@ -1,3 +1 @@
-<html>
-<body bgcolor="#FFFFFF"></body>
-</html>
+<!DOCTYPE html><title></title>
View
1 html/com_weblinks/weblink/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

0 comments on commit fb54e91

Please sign in to comment.
Something went wrong with that request. Please try again.