Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updates for release

  • Loading branch information...
commit b97b88899f1aaf0bca26f54d0210d5b47d8f71cd 1 parent 5f78ae5
Daniel Scott authored
View
10 admin/language/en-GB/en-GB.com_club.ini
@@ -1,5 +1,15 @@
+COM_CLUB_DESCRIPTION="Club Manager - A component for managing clubs, teams and members"
+
COM_CLUB_SUBMENU_CLUBS="Clubs"
COM_CLUB_SUBMENU_CATEGORIES="Categories"
COM_CLUB_SUBMENU_MEMBERS="Members"
COM_CLUB_SUBMENU_CLUBCATEGORIES="Club Categories"
COM_CLUB_SUBMENU_CATEGORYMEMBERS="Category Members"
+
+; Used for front end menu items and back end forms
+COM_CLUB_CLUB_FIELD_LABEL="Club"
+COM_CLUB_CLUB_FIELD_DESC="Club to display"
+COM_CLUB_CATEGORY_FIELD_LABEL="Category"
+COM_CLUB_CATEGORY_FIELD_DESC="Category to display"
+COM_CLUB_MEMBER_FIELD_LABEL="Member"
+COM_CLUB_MEMBER_FIELD_DESC="Member to display"
View
10 admin/sql/install.mysql.utf8.sql
@@ -115,10 +115,10 @@ INSERT INTO #__club (id, alias, name) VALUES
(1, 'testclub1', 'Test Club 1'),
(2, 'testclub2', 'Test Club 2');
-INSERT INTO #__club_category (id, alias, name, coach, trainer, manager) VALUES
- (1, 'testcat1', 'Test Category 1', 'Coach 1', 'Trainer 1', 'Manager 1'),
- (2, 'testcat2', 'Test Category 2', 'Coach 2', 'Trainer 2', 'Manager 2'),
- (3, 'testcat3', 'Test Category 3', 'Coach 3', 'Trainer 3', 'Manager 3');
+INSERT INTO #__club_category (id, alias, name, coach, trainer, manager, picture) VALUES
+ (1, 'testcat1', 'Test Category 1', 'Coach 1', 'Trainer 1', 'Manager 1', 'images/joomla_logo_black.jpg'),
+ (2, 'testcat2', 'Test Category 2', 'Coach 2', 'Trainer 2', 'Manager 2', ''),
+ (3, 'testcat3', 'Test Category 3', 'Coach 3', 'Trainer 3', 'Manager 3', '');
INSERT INTO #__club_categories (club_id, category_id, alias) VALUES
(1, 1, 'alias1'),
@@ -130,7 +130,7 @@ INSERT INTO #__club_member (id, alias, name, number) VALUES
(2, 'testmember2', 'Test Member 2', 2),
(3, 'testmember3', 'Test Member 3', 3);
-INSERT INTO #__club_member (id, alias, name, number, position, residence, nicknames, dob, nationality, club_history, honours, about, quote, home_town, fave_player, height_weight, school_attending, graduating_class, gpa, sat_act, level_rating, decision_makers, travel_schedule, hobbies, conference, picture, leaving_date, joining_date, first_name, middle_name, last_name) VALUES (4, 'testmember4', 'Test Member 4', 5, 'Attack', 'Home', 'Testy', '1990-01-01', 'National', 'Old Club', 'Winner', 'Me', 'Quote Me', 'Home town', 'Me', 'Tall, heavy', 'School', 'Class of ?', 'GPA', 'SAT', 'Level', 'Decision', 'Schedule', 'Hobbies', 'Conference', 'pic', '2010-04-25', '2011-05-25', 'First', 'Middle', 'Last');
+INSERT INTO #__club_member (id, alias, name, number, position, residence, nicknames, dob, nationality, club_history, honours, about, quote, home_town, fave_player, height_weight, school_attending, graduating_class, gpa, sat_act, level_rating, decision_makers, travel_schedule, hobbies, conference, picture, leaving_date, joining_date, first_name, middle_name, last_name) VALUES (4, 'testmember4', 'Test Member 4', 5, 'Attack', 'Home', 'Testy', '1990-01-01', 'National', 'Old Club', 'Winner', 'Me', 'Quote Me', 'Home town', 'Me', 'Tall, heavy', 'School', 'Class of ?', 'GPA', 'SAT', 'Level', 'Decision', 'Schedule', 'Hobbies', 'Conference', 'images/joomla_logo_black.jpg', '2010-04-25', '2011-05-25', 'First', 'Middle', 'Last');
INSERT INTO #__club_category_members (category_id, member_id) VALUES
(1, 1),
View
140 admin/sql/updates/mysql/1.0.sql
@@ -0,0 +1,140 @@
+DROP TABLE IF EXISTS #__club_category_members;
+DROP TABLE IF EXISTS #__club_member;
+DROP TABLE IF EXISTS #__club_categories;
+DROP TABLE IF EXISTS #__club_category;
+DROP TABLE IF EXISTS #__club;
+
+CREATE TABLE #__club (
+ id int(11) NOT NULL AUTO_INCREMENT,
+ alias varchar(255) NOT NULL default '',
+ name varchar(50) NOT NULL,
+ published tinyint(1) unsigned NOT NULL default '0',
+ checked_out int(11) unsigned NOT NULL default '0',
+ checked_out_time datetime NOT NULL default '0000-00-00 00:00:00',
+ editor varchar(150) NOT NULL default '',
+ ordering int(11) NOT NULL default '0',
+ params text NOT NULL,
+ access tinyint(3) unsigned NOT NULL default '0',
+ PRIMARY KEY (id)
+) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
+
+CREATE TABLE #__club_category (
+ id int(11) NOT NULL AUTO_INCREMENT,
+ alias varchar(255) NOT NULL default '',
+ name varchar(50) NOT NULL default '',
+ picture varchar(200) default NULL,
+ coach varchar(100) default NULL,
+ trainer varchar(100) default NULL,
+ manager varchar(100) default NULL,
+ published tinyint(1) unsigned NOT NULL default '0',
+ checked_out int(11) unsigned NOT NULL default '0',
+ checked_out_time datetime NOT NULL default '0000-00-00 00:00:00',
+ editor varchar(150) NOT NULL default '',
+ ordering int(11) NOT NULL default '0',
+ params text NOT NULL,
+ access tinyint(3) unsigned NOT NULL default '0',
+ PRIMARY KEY (id)
+) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
+
+CREATE TABLE #__club_member (
+ id int(11) NOT NULL AUTO_INCREMENT,
+ alias varchar(255) NOT NULL default '',
+ name varchar(50) NOT NULL default '',
+ number int(12) default NULL,
+ position varchar(100) default NULL,
+ residence varchar(100) default NULL,
+ nicknames varchar(200) default NULL,
+ dob date default NULL,
+ nationality varchar(50) default NULL,
+ club_history text default NULL,
+ honours text default NULL,
+ about text default NULL,
+ quote text default NULL,
+ home_town text default NULL,
+ fave_player text default NULL,
+ height_weight text default NULL,
+ school_attending text default NULL,
+ graduating_class text default NULL,
+ gpa text default NULL,
+ sat_act text default NULL,
+ level_rating text default NULL,
+ decision_makers text default NULL,
+ travel_schedule text default NULL,
+ hobbies text default NULL,
+ conference text default NULL,
+ picture text default NULL,
+ leaving_date date default NULL,
+ joining_date date default NULL,
+ first_name text NOT NULL default '',
+ middle_name text default NULL,
+ last_name text NOT NULL default '',
+ published tinyint(1) unsigned NOT NULL default '0',
+ checked_out int(11) unsigned NOT NULL default '0',
+ checked_out_time datetime NOT NULL default '0000-00-00 00:00:00',
+ editor varchar(150) NOT NULL default '',
+ ordering int(11) NOT NULL default '0',
+ params text NOT NULL,
+ user_id int(11) NOT NULL default '0',
+ access tinyint(3) unsigned NOT NULL default '0',
+ email_to varchar(60) default '',
+ description text(500) default '',
+ PRIMARY KEY (id)
+) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
+
+CREATE TABLE #__club_categories (
+ id int(11) NOT NULL AUTO_INCREMENT,
+ alias varchar(255) NOT NULL default '',
+ club_id int(11) NOT NULL,
+ category_id int(11) NOT NULL,
+ published tinyint(1) unsigned NOT NULL default '0',
+ checked_out int(11) unsigned NOT NULL default '0',
+ checked_out_time datetime NOT NULL default '0000-00-00 00:00:00',
+ editor varchar(150) NOT NULL default '',
+ ordering int(11) NOT NULL default '0',
+ params text NOT NULL,
+ access tinyint(3) unsigned NOT NULL default '0',
+ PRIMARY KEY (id)
+) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
+
+CREATE TABLE #__club_category_members (
+ id int(11) NOT NULL AUTO_INCREMENT,
+ category_id int(11) NOT NULL,
+ member_id int(11) NOT NULL,
+ alias varchar(255) NOT NULL default '',
+ published tinyint(1) unsigned NOT NULL default '0',
+ checked_out int(11) unsigned NOT NULL default '0',
+ checked_out_time datetime NOT NULL default '0000-00-00 00:00:00',
+ editor varchar(150) NOT NULL default '',
+ ordering int(11) NOT NULL default '0',
+ params text NOT NULL,
+ access tinyint(3) unsigned NOT NULL default '0',
+ PRIMARY KEY (id)
+) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;
+
+INSERT INTO #__club (id, alias, name) VALUES
+ (1, 'testclub1', 'Test Club 1'),
+ (2, 'testclub2', 'Test Club 2');
+
+INSERT INTO #__club_category (id, alias, name, coach, trainer, manager, picture) VALUES
+ (1, 'testcat1', 'Test Category 1', 'Coach 1', 'Trainer 1', 'Manager 1', 'images/joomla_logo_black.jpg'),
+ (2, 'testcat2', 'Test Category 2', 'Coach 2', 'Trainer 2', 'Manager 2', ''),
+ (3, 'testcat3', 'Test Category 3', 'Coach 3', 'Trainer 3', 'Manager 3', '');
+
+INSERT INTO #__club_categories (club_id, category_id, alias) VALUES
+ (1, 1, 'alias1'),
+ (1, 2, 'alias2'),
+ (2, 3, 'alias3');
+
+INSERT INTO #__club_member (id, alias, name, number) VALUES
+ (1, 'testmember1', 'Test Member 1', 1),
+ (2, 'testmember2', 'Test Member 2', 2),
+ (3, 'testmember3', 'Test Member 3', 3);
+
+INSERT INTO #__club_member (id, alias, name, number, position, residence, nicknames, dob, nationality, club_history, honours, about, quote, home_town, fave_player, height_weight, school_attending, graduating_class, gpa, sat_act, level_rating, decision_makers, travel_schedule, hobbies, conference, picture, leaving_date, joining_date, first_name, middle_name, last_name) VALUES (4, 'testmember4', 'Test Member 4', 5, 'Attack', 'Home', 'Testy', '1990-01-01', 'National', 'Old Club', 'Winner', 'Me', 'Quote Me', 'Home town', 'Me', 'Tall, heavy', 'School', 'Class of ?', 'GPA', 'SAT', 'Level', 'Decision', 'Schedule', 'Hobbies', 'Conference', 'images/joomla_logo_black.jpg', '2010-04-25', '2011-05-25', 'First', 'Middle', 'Last');
+
+INSERT INTO #__club_category_members (category_id, member_id) VALUES
+ (1, 1),
+ (2, 2),
+ (2, 3),
+ (2, 4);
+
View
8 club.xml
@@ -2,13 +2,13 @@
<extension type="component" version="1.6.0" method="upgrade">
<name>COM_CLUB</name>
- <creationDate>April 2011</creationDate>
+ <creationDate>May 2011</creationDate>
<author>Daniel Scott</author>
<authorEmail>dan@danieljamesscott.org</authorEmail>
<authorUrl>http://danieljamesscott.org</authorUrl>
<copyright>Copyright Daniel Scott 2011</copyright>
<license>GPL V3 or later</license>
- <version>0.6</version>
+ <version>1.0</version>
<description>COM_CLUB_DESCRIPTION</description>
<install>
@@ -64,4 +64,8 @@
<language tag="en-GB">language/en-GB/en-GB.com_club.sys.ini</language>
</languages>
</administration>
+
+ <updateservers>
+ <server type="extension" priority="1" name="Club Manager Update Site">http://danieljamesscott.org/joomla_extensions/update/com_club-update.xml</server>
+ </updateservers>
</extension>
View
8 site/language/en-GB/en-GB.com_club.ini
@@ -1,4 +1,3 @@
-COM_CLUB_DESCRIPTION="Club Manager - A component for managing clubs, teams and members"
COM_CLUB_MEMBER_PLAYER_PROFILE="Player profile - "
COM_CLUB_DESIGNED_BY="Designed by:"
COM_CLUB_CATEGORY_INFORMATION="Category information - "
@@ -12,13 +11,6 @@ COM_CLUB_CATEGORYMEMBERS_MENU="Category members"
COM_CLUB_ADMINISTRATION="Club - Administration"
-COM_CLUB_CLUB_FIELD_LABEL="Club"
-COM_CLUB_CLUB_FIELD_DESC="Club to display"
-COM_CLUB_CATEGORY_FIELD_LABEL="Category"
-COM_CLUB_CATEGORY_FIELD_DESC="Category to display"
-COM_CLUB_MEMBER_FIELD_LABEL="Member"
-COM_CLUB_MEMBER_FIELD_DESC="Member to display"
-
COM_CLUB_CLUB_ERROR_UNACCEPTABLE="Cannot contain numbers"
View
4 site/views/category/tmpl/default.php
@@ -16,8 +16,8 @@
</div> <!-- /club_category_head -->
<div id="club_category_left" style="width:50%;float:left;">
-<?php if ( $this->items[0]->picture ) : ?>
-<?php echo $this->items[0]->picture; ?>
+<?php if ( $this->items[0]->picture_html ) : ?>
+<?php echo $this->items[0]->picture_html; ?>
<?php endif; ?>
</div> <!-- /club_category_left -->
View
4 site/views/category/view.html.php
@@ -23,9 +23,9 @@ function display($tpl = null) {
// Get picture image url
if($this->items[0]->picture) {
- $this->items[0]->picture = JHTML::_('image.site', '', '/images/club/', $this->items[0]->picture, '/images/club/', $this->items[0]->name . ' picture', 'align="middle" width="250" height="209"');
+ $this->items[0]->picture_html = JHtml::_('image', '/' . $this->items[0]->picture, $this->items[0]->name . ' picture', 'align="middle" width="250" height="209"', true);
} else {
- $this->items[0]->picture = JText::_("COM_CLUB_NO_PICTURE_AVAILABLE");
+ $this->items[0]->picture_html = JText::_("COM_CLUB_NO_PICTURE_AVAILABLE");
}
// Check for errors.
View
4 site/views/member/tmpl/default.php
@@ -16,8 +16,8 @@
</div> <!-- /club_member_head -->
<div id="club_member_left" style="width:50%;float:left;">
-<?php if ( $this->item->picture ) : ?>
-<?php echo $this->item->picture; ?>
+<?php if ( $this->item->picture_html ) : ?>
+<?php echo $this->item->picture_html; ?>
<?php endif; ?>
<ul>
View
4 site/views/member/view.html.php
@@ -23,9 +23,9 @@ function display($tpl = null) {
// Get picture image url
if($this->item->picture) {
- $this->item->picture = JHTML::_('image.site', '', '/images/club/', $this->item->picture, '/images/club/', $this->item->name . ' picture', 'align="middle" width="250" height="209"');
+ $this->item->picture_html = JHtml::_('image', '/' . $this->item->picture, $this->item->name . ' picture', 'align="middle" width="250" height="209"', true);
} else {
- $this->item->picture = JText::_("COM_CLUB_NO_PICTURE_AVAILABLE");
+ $this->item->picture_html = JText::_("COM_CLUB_NO_PICTURE_AVAILABLE");
}
// Check for errors.
Please sign in to comment.
Something went wrong with that request. Please try again.