Merge pull request #1 from elinw/details

Add some language strings and delete unused checkboxes.
ianmacl · Mar 7, 2012 · 6c8916f · 6c8916f
2 parents 36713df + 540cddf
commit 6c8916f
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 13 deletions.
diff --git a/administrator/components/com_onward/views/site/tmpl/edit.php b/administrator/components/com_onward/views/site/tmpl/edit.php
@@ -5,7 +5,7 @@
  * @copyright	Copyright (C) 2005 - 2011 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2; see LICENSE.txt
  */
- 
+
 // No direct access.
 defined('_JEXEC') or die;
 
@@ -31,7 +31,7 @@
 		url: 'index.php?<?php echo JSession::getFormToken(); ?>=1'
 	});
 
-	window.addEvent('domready', function(){		
+	window.addEvent('domready', function(){
 		$$('.progress_bar').each(function(item) {
 			progressBars[item.get('id')] = new Fx.ProgressBar(item, {
 				text: new Element('span', {'class': 'progress-text'}).inject(item, 'bottom'),
@@ -57,23 +57,23 @@
 
 			<li><?php echo JTEXT::_('COM_ONWARD_DESCRIPTION'); ?>
 			<?php echo $this->item->description; ?></li>
-			
+
 		</ul>
 		<div class="clr"> </div>
 		<table class="adminlist">
 			<thead>
 			<tr>
 				<th width="1%">
-					<input type="checkbox" name="checkall-toggle" value="" onclick="checkAll(this)" />
+
 				</th>
 				<th>
-					<?php echo JText::_('Asset'); ?>
+					<?php echo JText::_('COM_ONWARD_ASSET'); ?>
 				</th>
 				<th>
-					<?php echo JText::_('Scan Date'); ?>
+					<?php echo JText::_('COM_ONWARD_SCAN_DATE'); ?>
 				</th>
 				<th width="20%">
-					<?php echo JText::_('Progress'); ?>
+					<?php echo JText::_('COM_ONWARD_PROGRESS'); ?>
 				</th>
 			</tr>
 			</thead>
@@ -85,7 +85,7 @@
 			?>
 			<tr class="row<?php echo $i % 2; ?>">
 				<td class="center">
-					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+					<?php  ?>
 				</td>
 				<td>
 					<?php echo $item->asset; ?>

diff --git a/administrator/components/com_onward/views/sites/tmpl/default.php b/administrator/components/com_onward/views/sites/tmpl/default.php
@@ -18,16 +18,16 @@
 		<thead>
 			<tr>
 				<th width="1%">
-					<input type="checkbox" name="checkall-toggle" value="" onclick="checkAll(this)" />
+
 				</th>
 				<th>
-					<?php echo JText::_('Site Name'); ?>
+					<?php echo JText::_('COM_ONWARD_SITE_NAME'); ?>
 				</th>
 				<th>
-					<?php echo JText::_('Location'); ?>
+					<?php echo JText::_('COM_ONWARD_LOCATION'); ?>
 				</th>
 				<th width="5%">
-					<?php echo JText::_('Version'); ?>
+					<?php echo JText::_('COM_ONWARD_VERSION'); ?>
 				</th>
 			</tr>
 		</thead>
@@ -39,7 +39,7 @@
 			?>
 			<tr class="row<?php echo $i % 2; ?>">
 				<td class="center">
-					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+					<?php  ?>
 				</td>
 				<td>
 					<a href="<?php echo $item->import_link; ?>" alt="Import <?php echo $this->escape($item->name); ?>"><?php echo $this->escape($item->name); ?></a>

diff --git a/administrator/language/en-GB/en-GB.com_onward.ini b/administrator/language/en-GB/en-GB.com_onward.ini
@@ -0,0 +1,21 @@
+; Copyright (C) 2005 - 2012 Open Source Matters. All rights reserved.
+; Joomla! Project
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+JTOOLBAR_DISCOVER="DISCOVER"
+
+COM_MEDIA_OVERALL_PROGRESS="Progress"
+COM_ONWARD_DESCRIPTION="Description"
+COM_ONWARD_LOCATION="Location"
+COM_ONWARD_SITE_DETAILS="Site Details"
+COM_ONWARD_SITE_NAME="Site name"
+COM_ONWARD_VERSION="Version"
+COM_ONWARD_PROGRESS="Progress"
+COM_ONWARD_SCAN_DATE="Scan Date"
+COM_ONWARD_ASSET="Asset"
+COM_ONWARD_MANAGER_SITE_VIEW="Site"
+COM_ONWARD_MANAGER_SITES="Site Manager"
+JTOOLBAR_BATCH="Batch"
+JTOOLBAR_SCAN="Scan"
+JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this component. Note that:<br /><em>Inherited</em> means that the permissions from global configuration and parent group will be used.<br /><em>Denied</em> means that no matter what the global configuration or parent group settings are, the group being edited cannot take this action on this component.<br /><em>Allowed</em> means that the group being edited will be able to take this action for this component (but if this is in conflict with the global configuration or parent group it will have no impact; a conflict will be indicated by <em>Not Allowed (Locked)</em> under Calculated Settings).<br />2. If you select a new setting, click <em>Save</em> to refresh the calculated settings."