[Phpbbproject-svn] SF.net SVN: phpbbproject:[283] trunk/phpbb3/root
phpBB download manager, mainly aimed at MOD authors
Status: Planning
Brought to you by:
lord_le_brand
From: <lor...@us...> - 2008-07-22 21:58:59
|
Revision: 283 http://phpbbproject.svn.sourceforge.net/phpbbproject/?rev=283&view=rev Author: lord_le_brand Date: 2008-07-22 21:59:06 +0000 (Tue, 22 Jul 2008) Log Message: ----------- Fixed one of many errors with _module_*_url... Added language entries Fixed a missing column in SELECT query Changed the catlist a bit Modified Paths: -------------- trunk/phpbb3/root/includes/project/project_main.php trunk/phpbb3/root/includes/project/project_trackers.php trunk/phpbb3/root/language/en/mods/phpbbproject.php trunk/phpbb3/root/project_install/install_install.php trunk/phpbb3/root/styles/prosilver/template/project_catlist.html Modified: trunk/phpbb3/root/includes/project/project_main.php =================================================================== --- trunk/phpbb3/root/includes/project/project_main.php 2008-07-21 20:16:03 UTC (rev 282) +++ trunk/phpbb3/root/includes/project/project_main.php 2008-07-22 21:59:06 UTC (rev 283) @@ -456,7 +456,7 @@ */ $category_ids = '1 = 1'; - $sql = 'SELECT category_id, category_title + $sql = 'SELECT category_id, category_title, parent_id FROM ' . PROJECT_CATEGORIES_TABLE . " WHERE $category_ids ORDER BY left_id ASC"; Modified: trunk/phpbb3/root/includes/project/project_trackers.php =================================================================== --- trunk/phpbb3/root/includes/project/project_trackers.php 2008-07-21 20:16:03 UTC (rev 282) +++ trunk/phpbb3/root/includes/project/project_trackers.php 2008-07-22 21:59:06 UTC (rev 283) @@ -89,7 +89,7 @@ if (!$tracker_id) { $url_extra = _module_trackers_url('tracker', array()); - redirect(_module_trackers_url(append_sid(PROJECT_BASE_URL, 'i=trackers&mode=main'))); + redirect(append_sid(PROJECT_BASE_URL, 'i=trackers&mode=main') . $url_extra); } $sql = 'SELECT COUNT(t.*) AS num_tickets Modified: trunk/phpbb3/root/language/en/mods/phpbbproject.php =================================================================== --- trunk/phpbb3/root/language/en/mods/phpbbproject.php 2008-07-21 20:16:03 UTC (rev 282) +++ trunk/phpbb3/root/language/en/mods/phpbbproject.php 2008-07-22 21:59:06 UTC (rev 283) @@ -22,7 +22,7 @@ } // Some characters you may want to copy&paste: -// ’ » “ \xE2\x80? … +// ’ » “ �? … $lang = array_merge($lang, array( 'PHPBB_PROJECT' => 'phpBB Project', 'PHPBBPROJECT_COPYRIGHT' => '© 2007 phpBB Project Team', @@ -44,6 +44,7 @@ 'PROJECT_VIEW_CATEGORY' => 'View category', 'PROJECT_CREATE_PROJECT' => 'Create new project', 'PROJECT_IMPORT_PROJECT' => 'Import project', + 'PROJECT_PROJECT_OVERVIEW' => 'Project overview', 'PROJECT_VIEW_INFO' => 'View project information', 'PROJECT_VIEW_AUTHORS' => 'View project authors', 'PROJECT_VIEW_HISTORY' => 'View project history', @@ -71,10 +72,25 @@ 'PROJECT_NO_PROJECTS' => 'No projects', // Creating/importing projects + 'PROJECT_CATEGORY' => 'Category', + 'PROJECT_LICENSE' => 'License', + 'PROJECT_DISPLAY_LICENSE_DESC' => 'Display description', + 'PROJECT_FILE_ONLY' => 'File only', + 'PROJECT_FILE_ONLY_EXPLAIN' => 'When checked, there will be no MODX file in the download package', + 'PROJECT_TITLE_TOO_SHORT' => 'The title you specified is too short', 'PROJECT_TITLE_TOO_LONG' => 'The title you specified is too long', 'PROJECT_TITLE_TAKEN' => 'The title you specified is taken', + 'PROJECT_NO_FILE_SENT' => 'There is no file uploaded', + 'PROJECT_IMPORT_FAILURE' => 'Failed to import project', + 'PROJECT_CREATE_FAILURE' => 'Failed to create project', + 'PROJECT_CREATE_SUCCESS' => 'New project created successfully!', + 'PROJECT_VIEW_PROJECT' => 'Click %sHere%s to view your project', + 'PROJECT_VIEW_TOPIC' => 'Click %sHere%s to view the associated topic', + 'PROJECT_BACK_OVERVIEW' => 'Click %sHere%s to return to the main overview', + + // View Project 'PROJECT_BACK_TO_CATEGORY' => 'Go back to category <strong>%s</strong>', @@ -84,14 +100,14 @@ 'PROJECT_NOTES' => 'Author notes', 'PROJECT_VERSION' => 'Version', + 'PROJECT_AUTHOR_ROLE' => 'Author role', + 'REALNAME' => 'Real name', + // Download 'PROJECT_DOWNLOAD' => 'Download', 'PROJECT_DOWNLOAD_EXPLAIN' => 'You want to download <strong>%s</strong>. Please specify the following and click the <strong>Download</strong> button to proceed.', 'PROJECT_ARCHIVETYPE' => 'Archive filetype', - 'REALNAME' => 'Real name', - - // Install levels 'PROJECT_LEVEL_ADVANCED' => 'Advanced', 'PROJECT_LEVEL_EASY' => 'Easy', @@ -120,6 +136,9 @@ 'ROLE_PROJECT_TEAM' => 'Can manage categories and roles and can approve projects', 'ROLE_PROJECT_USER' => 'Can browse and dwnload the project and read documentation', + // Trackers + 'PROJECT_ALL_CATEGORIES' => 'All categories', + // Installation stuff... 'PROJECT_INSTALL' => 'Install phpBB Project', @@ -138,6 +157,7 @@ 'PROJECT_INSTALL_MODULES_TITLE' => 'Create modules', 'PROJECT_INSTALL_MODULES_TEXT' => 'Modules created successfully!<br /><br />phpBB project is now installed. Click on the button below to view the overview directly, or %sgo back to the board index%s.', + 'PROJECT_PHP_VERSION_TOO_LOW' => 'The PHP version on your server is too low. PHP 5.0.0 or higher is required for phpBB Project', 'NOT_ALLOWED_INSTALL_PROJECT' => 'You are not allowed to install phpBB Project; only founders can install phpBB Project.', 'PROJECT_ALREADY_INSTALLED' => 'phpBB Project is already installed.', Modified: trunk/phpbb3/root/project_install/install_install.php =================================================================== --- trunk/phpbb3/root/project_install/install_install.php 2008-07-21 20:16:03 UTC (rev 282) +++ trunk/phpbb3/root/project_install/install_install.php 2008-07-22 21:59:06 UTC (rev 283) @@ -200,7 +200,7 @@ 'INSERT INTO ' . PROJECT_LICENSES_TABLE . " (license_title, license_acronym, license_description, license_text, license_url) VALUES ('GNU General Public License version 2', 'GPLv2', 'This is a short explanation of what the GPL is.... Well it should be anyway.', '$gpl_text', 'http://www.gnu.org/licenses/old-licenses/gpl-2.0.html')", 'INSERT INTO ' . PROJECT_LICENSES_TABLE . " (license_title, license_acronym, license_description, license_text, license_url) - VALUES ('Creative Commons ttribution 3.0', 'CC-BY 3.0', 'You are free: + VALUES ('Creative Commons Attribution 3.0', 'CC-BY 3.0', 'You are free: * to Share - to copy, distribute and transmit the work * to Remix - to adapt the work Modified: trunk/phpbb3/root/styles/prosilver/template/project_catlist.html =================================================================== --- trunk/phpbb3/root/styles/prosilver/template/project_catlist.html 2008-07-21 20:16:03 UTC (rev 282) +++ trunk/phpbb3/root/styles/prosilver/template/project_catlist.html 2008-07-22 21:59:06 UTC (rev 283) @@ -11,13 +11,13 @@ <ul class="topiclist forums"> <!-- BEGIN category_row --> <li class="row"> - <dl class="icon" style="background-image: url({category_row.FOLDER_IMG_SRC}); background-repeat: no-repeat;"> - <dt><a href="{category_row.U_CAT_URL}" class="forumtitle">{category_row.TITLE}</a><br /> - {category_row.DESCRIPTION} - <!-- IF .category_row.sub_category --> - <br /> - - <!-- ENDIF --> + <dl class="icon" style="background-image: url({category_row.CATEGORY_FOLDER_IMG_SRC}); background-repeat: no-repeat;"> + <dt title="category_row.CATEGORY_FOLDER_IMG_ALT"> + <!-- IF category_row.CATEGORY_IMAGE --><span class="forum-image">{category_row.CATEGORY_IMAGE}</span><!-- ENDIF --> + <a href="{category_row.U_CAT_URL}" class="forumtitle">{category_row.TITLE}</a><br /> + {category_row.DESCRIPTION} + <!-- IF category_row.SUBCATEGORIES and category_row.S_LIST_SUBCATEGORIES --><br /><strong>{category_row.L_SUBCATEGORY_STR}</strong> {category_row.SUBCATEGORIES}<!-- ENDIF --> + </dt> <dd class="topics">{category_row.PROJECTS}</dd> <dd class="lastpost"><span> <!-- IF category_row.S_LAST_UPDATE --><a href="{category_row.U_LAST_UPDATE}">{category_row.LAST_UPDATE_TITLE}</a> <br />{L_POSTED_ON_DATE} {category_row.LAST_UPDATE_TIME}<!-- ELSE --><span style="font-size: 1.2em; line-height: 2.2em">{L_PROJECT_NO_PROJECTS}</span><!-- ENDIF --></span> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |