Skip to content

Commit

Permalink
BlueStork CSS updates, interface fixes, replace tables in administrat…
Browse files Browse the repository at this point in the history 
…or components & mod_online/quickicon/unread, new & updated language strings

git-svn-id: http://joomlacode.org/svn/joomla/development/trunk@12754 6f6e1ebd-4c2b-0410-823f-f34bde69bce9
  • Loading branch information
@severdia
severdia committed Sep 16, 2009
1 parent 9f2deba commit 1ff4258
Show file tree
Hide file tree
Showing 34 changed files with 261 additions and 140 deletions.
2 changes: 1 addition & 1 deletion administrator/components/com_banners/views/banner.php
View file
Expand Up @@ -18,7 +18,7 @@ class BannersViewBanner
{
function setBannersToolbar()
{
JToolBarHelper::title(JText::_('Banner Manager'), 'generic.png');
JToolBarHelper::title(JText::_('Banner Manager'), 'banner.png');
JToolBarHelper::publishList();
JToolBarHelper::unpublishList();
JToolBarHelper::custom('copy', 'copy.png', 'copy_f2.png', 'Copy');
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_banners/views/client.php
View file
Expand Up @@ -15,7 +15,7 @@ class BannersViewClients
{
function setClientsToolbar()
{
JToolBarHelper::title(JText::_('Banner Client Manager'), 'generic.png');
JToolBarHelper::title(JText::_('Banner Client Manager'), 'bannerclients.png');
JToolBarHelper::deleteList('', 'remove');
JToolBarHelper::editList('edit');
JToolBarHelper::addNew('add');
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_checkin/views/checkin/tmpl/default.php
View file
Expand Up @@ -36,7 +36,7 @@
?>
<tr>
<td colspan="3">
<strong><?php echo JText::_('Checked out items have now been all checked in'); ?></strong>
<span class="stat-notice"><?php echo JText::_('Checked out items have now been all checked in'); ?></span>
</td>
</tr>
</table>
Expand Down
13 changes: 13 additions & 0 deletions administrator/components/com_config/models/forms/application.xml
View file
Expand Up @@ -531,6 +531,19 @@
size="50"
/>

<field
name="sitename_pagetitles"
type="radio"
default="0"
label="Config_Sitename_Pagetitles_Label"
description="Config_Sitename_Pagetitles_Desc"
required="true"
filter="integer"
>
<option value="1">JYes</option>
<option value="0">JNo</option>
</field>

<field
name="editor"
type="editors"
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_contact/toolbar.contact.html.php
View file
Expand Up @@ -22,9 +22,9 @@ class TOOLBAR_contact
function _EDIT($edit) {
$cid = JRequest::getVar('cid', array(0), '', 'array');

$text = ($edit ? JText::_('Edit') : JText::_('New'));
$text = ($edit ? JText::_('Edit_Contact') : JText::_('Add_New_Contact'));

JToolBarHelper::title(JText::_('Contact') .': <small><small>[ '. $text .' ]</small></small>', 'generic.png');
JToolBarHelper::title(JText::_('COM_CONTACTS') .': '. $text .'', 'contact.png');

//JToolBarHelper::custom('save2new', 'new.png', 'new_f2.png', 'Save & New', false, false);
//JToolBarHelper::custom('save2copy', 'copy.png', 'copy_f2.png', 'Save To Copy', false, false);
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_massmail/admin.massmail.html.php
View file
Expand Up @@ -40,7 +40,7 @@ function submitbutton(pressbutton) {

<form action="index.php" name="adminForm" method="post">

<div class="col width-30">
<div class="width-30">
<fieldset class="adminform">
<legend><?php echo JText::_('Details'); ?></legend>

Expand Down Expand Up @@ -95,7 +95,7 @@ function submitbutton(pressbutton) {
</fieldset>
</div>

<div class="col width-70">
<div class="width-70">
<fieldset class="adminform">
<legend><?php echo JText::_('Message'); ?></legend>

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_media/assets/mediamanager.css
View file
Expand Up @@ -29,7 +29,7 @@

#folderview input#folderpath {
width: 65%;
background-color: #EEE;
background-color: #f5f5f5;
}

#folderview input#foldername {
Expand Down
1 change: 1 addition & 0 deletions administrator/components/com_media/views/media/tmpl/default.php
View file
@@ -1,3 +1,4 @@

<?php defined('_JEXEC') or die; ?>
<table width="100%" cellspacing="0">
<tr valign="top">
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_media/views/medialist/tmpl/details.php
View file
Expand Up @@ -6,8 +6,8 @@
<tr>
<th><?php echo JText::_('Preview'); ?></th>
<th><?php echo JText::_('Name'); ?></th>
<th><?php echo JText::_('Dimensions'); ?></th>
<th><?php echo JText::_('Size'); ?></th>
<th><?php echo JText::_('Pixel_Dimensions'); ?></th>
<th><?php echo JText::_('File_Size'); ?></th>
<th><?php echo JText::_('Delete'); ?></th>
</tr>
</thead>
Expand Down
39 changes: 37 additions & 2 deletions administrator/components/com_menus/models/forms/item_component.xml
View file
Expand Up @@ -42,7 +42,15 @@
<option
value="1">JYes</option>
</field>


<field
id="page_heading"
name="page_heading"
type="text"
label="Menus_Item_Page_Heading_Label"
description="Menus_Item_Page_Heading_Desc"
default=""/>

<field
id="pageclass_sfx"
name="pageclass_sfx"
Expand All @@ -58,6 +66,14 @@
label="Menus_Item_Menu_Image_Label"
description="Menus_Item_Menu_Image_Desc"
default=""/>

<field
id="link_title"
name="link_title"
type="text"
label="Menus_Item_Link_Title_Label"
description="Menus_Item_Link_Title_Desc"
default=""/>

<field
id="secure"
Expand Down Expand Up @@ -94,7 +110,26 @@
default=""
rows="3"
cols="40"/>


<field
name="robots"
type="list"
label="JField_Metadata_Robots_Label"
description="JField_Metadata_Robots_Desc"
default="">
<option
value="">Use Global</option>
<option
value="0">index, follow</option>
<option
value="1">noindex, follow</option>
<option
value="2">index, nofollow</option>
<option
value="3">noindex, nofollow</option>
<option
value="4">Don't display robots tag</option>
</field>

</fields>

Expand Down
11 changes: 11 additions & 0 deletions administrator/components/com_menus/views/items/tmpl/default.php
View file
Expand Up @@ -50,6 +50,11 @@
<option value=""><?php echo JText::_('JMenu_Option_Select_Level');?></option>
<?php echo JHtml::_('select.options', $this->f_levels, 'value', 'text', $this->state->get('filter.level'));?>
</select>

<select name="filter_menutype" class="inputbox" onchange="this.form.submit()">
<option value=""><?php echo JText::_('JMenu_Option_Select_Menutype');?></option>
<?php echo JHtml::_('select.options', $this->f_levels, 'value', 'text', $this->state->get('filter.level'));?>
</select>
</div>
</fieldset>

Expand All @@ -72,6 +77,9 @@
<th width="10%" class="title">
<?php echo JHtml::_('grid.sort', 'JGrid_Heading_Access', 'access_level', $this->state->get('list.direction'), $this->state->get('list.ordering')); ?>
</th>
<th width="10%" class="title">
<?php echo JText::_('JGrid_Heading_Menu_Type'); ?>
</th>
<th width="1%" nowrap="nowrap">
<?php echo JHtml::_('grid.sort', 'JGrid_Heading_ID', 'a.lft', $this->state->get('list.direction'), $this->state->get('list.ordering')); ?>
</th>
Expand Down Expand Up @@ -120,6 +128,9 @@
<td align="center">
<?php echo $this->escape($item->access_level); ?>
</td>
<td align="center">
Type
</td>
<td align="center">
<span title="<?php echo sprintf('%d-%d', $item->lft, $item->rgt);?>">
<?php echo (int) $item->id; ?></span>
Expand Down
8 changes: 4 additions & 4 deletions administrator/components/com_menus/views/items/tmpl/default_batch.php
View file
Expand Up @@ -17,16 +17,16 @@
$published = $this->state->get('filter.published');
?>
<fieldset class="batch">
<p>

<legend><?php echo JText::_('Menus_Batch_Options');?></legend>

<label for="batch_access">
<?php echo JText::_('Menus_Batch_Access_Label'); ?>
</label>
<?php echo JHtml::_('access.assetgrouplist', 'batch[assetgroup_id]', '', 'class="inputbox"', array('title' => '', 'id' => 'batch_access'));?>
</p>

<?php if (is_numeric($published)) : ?>
<p>

<label for="batch_access">
<?php echo JText::_('Menus_Batch_Menu_Label'); ?>
</label>
Expand All @@ -35,7 +35,7 @@
<?php echo JHtml::_('select.options', JHtml::_('menu.menuitems', array('published' => $published)));?>
</select>
<?php echo JHTML::_( 'select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
</p>

<?php endif; ?>

<button type="submit" onclick="submitbutton('item.batch');">
Expand Down
24 changes: 11 additions & 13 deletions administrator/components/com_menus/views/menu/tmpl/edit.php
View file
Expand Up @@ -29,25 +29,23 @@ function submitbutton(task)
</script>

<form action="<?php JRoute::_('index.php?option=com_menus'); ?>" method="post" name="adminForm" id="item-form">
<fieldset style="width:45%;float:left">
<div class="width-40">
<fieldset>
<legend><?php echo JText::_('Menus_Menu_Details');?></legend>
<ol>
<li>
<?php echo $this->form->getLabel('menutype'); ?><br />
<?php echo $this->form->getInput('menutype'); ?>
</li>
<li>
<?php echo $this->form->getLabel('title'); ?><br />

<?php echo $this->form->getLabel('title'); ?>
<?php echo $this->form->getInput('title'); ?>
</li>
<li>
<?php echo $this->form->getLabel('description'); ?><br />

<?php echo $this->form->getLabel('menutype'); ?>
<?php echo $this->form->getInput('menutype'); ?>

<?php echo $this->form->getLabel('description'); ?>
<?php echo $this->form->getInput('description'); ?>
</li>
</ol>

</fieldset>

<input type="hidden" name="task" value="" />
<?php echo JHtml::_('form.token'); ?>
</div>
</form>
<div class="clr"></div>
12 changes: 6 additions & 6 deletions administrator/components/com_modules/views/module/tmpl/default.php
View file
Expand Up @@ -37,7 +37,7 @@ function submitbutton(pressbutton) {
//-->
</script>
<form action="<?php echo JRoute::_('index.php');?>" method="post" name="adminForm">
<div class="col width-50">
<div class="width-50">
<fieldset class="adminform">
<legend><?php echo JText::_('Details'); ?></legend>

Expand Down Expand Up @@ -219,7 +219,7 @@ function enableselections() {
</fieldset>
</div>

<div class="col width-50">
<div class="width-50">
<fieldset class="adminform">
<legend><?php echo JText::_('Parameters'); ?></legend>

Expand All @@ -230,7 +230,7 @@ function enableselections() {
if ($this->params = $p->render('params')) :
echo $this->params;
else :
echo "<div style=\"text-align: center; padding: 5px; \">".JText::_('There are no parameters for this item')."</div>";
echo "<div class=\"noparams-notice\">".JText::_('There are no parameters for this item')."</div>";
endif;
echo $pane->endPanel();

Expand All @@ -239,7 +239,7 @@ function enableselections() {
if ($this->params = $p->render('params', 'advanced')) :
echo $this->params;
else :
echo "<div style=\"text-align: center; padding: 5px; \">".JText::_('There are no advanced parameters for this item')."</div>";
echo "<div class=\"noparams-notice\">".JText::_('There are no advanced parameters for this item')."</div>";
endif;
echo $pane->endPanel();
}
Expand All @@ -249,7 +249,7 @@ function enableselections() {
if ($this->params = $p->render('params', 'legacy')) :
echo $this->params;
else :
echo "<div style=\"text-align: center; padding: 5px; \">".JText::_('There are no legacy parameters for this item')."</div>";
echo "<div class=\"noparams-notice\">".JText::_('There are no legacy parameters for this item')."</div>";
endif;
echo $pane->endPanel();
}
Expand All @@ -260,7 +260,7 @@ function enableselections() {
if ($this->params = $p->render('params', 'other')) :
echo $this->params;
else :
echo "<div style=\"text-align: center; padding: 5px; \">".JText::_('There are no other parameters for this item')."</div>";
echo "<div class=\"noparams-notice\">".JText::_('There are no other parameters for this item')."</div>";
endif;
echo $pane->endPanel();
}
Expand Down

0 comments on commit 1ff4258

Please sign in to comment.