diff options
28 files changed, 72 insertions, 78 deletions
@@ -1,14 +1,18 @@ files +data +patches + site/app/config/config-local.php site/app/config/config.php site/app/tmp site/vendors/product-details -data + site/app/config/revisions.php *.mo site/app/webroot/css/style.min.css site/app/webroot/js/__utm.min.js site/app/webroot/js/jquery.addons.min.js + *.*~ .bash_profile .bashrc @@ -19,5 +23,4 @@ site/app/webroot/js/jquery.addons.min.js .viminfo cron.script memo -patches 00* diff --git a/bin/build.py b/bin/build.py index 0996e08..73d8851 100755 --- a/bin/build.py +++ b/bin/build.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -"""Mozilla Add-ons build script +"""Sugar Labs build script If you update this script to touch a file in SVN you MUST update clean.sh to remove that file. On preview things are run in the following order: @@ -233,8 +233,8 @@ def main(argv = None): sys.exit(1) #TODO these are commented out unit we can fix them fo use with also -# updateRevisions() -# concatAndMinify() + updateRevisions() + concatAndMinify() compilePo() print 'Done.' diff --git a/site/app/controllers/admin_controller.php b/site/app/controllers/admin_controller.php index c7ef6f5..eb90afb 100644 --- a/site/app/controllers/admin_controller.php +++ b/site/app/controllers/admin_controller.php @@ -60,7 +60,7 @@ class AdminController extends AppController $this->Amo->clean($this->data, false); $this->layout = 'mozilla'; - $this->pageTitle = 'Mozilla Add-ons :: Admin Control Panel'; + $this->pageTitle = 'Sugar Labs Activites :: Admin Control Panel'; $this->cssAdd = array('admin', 'developers'); $this->set('cssAdd', $this->cssAdd); diff --git a/site/app/controllers/components/editors.php b/site/app/controllers/components/editors.php index 25bc349..0abb343 100644 --- a/site/app/controllers/components/editors.php +++ b/site/app/controllers/components/editors.php @@ -137,7 +137,7 @@ class EditorsComponent extends Object { if ($data['Approval']['ActionField'] != 'superreview') { $this->controller->Email->template = 'email/nominated/'.$data['Approval']['ActionField']; $this->controller->Email->to = $emailInfo['email']; - $this->controller->Email->subject = sprintf(_('Mozilla Add-ons: %s Nomination'), $emailInfo['name']); + $this->controller->Email->subject = sprintf(_('Sugar Labs Activities: %s Nomination'), $emailInfo['name']); } else { $this->controller->Email->template = 'email/superreview'; @@ -268,7 +268,7 @@ class EditorsComponent extends Object { if ($data['Approval']['ActionField'] != 'superreview') { $this->controller->Email->template = 'email/pending/'.$data['Approval']['ActionField']; $this->controller->Email->to = $emailInfo['email']; - $this->controller->Email->subject = sprintf(_('Mozilla Add-ons: %s %s'), $emailInfo['name'], $emailInfo['version']); + $this->controller->Email->subject = sprintf(_('Sugar Labs Activities: %s %s'), $emailInfo['name'], $emailInfo['version']); } else { $this->controller->Email->template = 'email/superreview'; diff --git a/site/app/tests/cake_reporter.php b/site/app/tests/cake_reporter.php index be26b32..b8cd724 100644 --- a/site/app/tests/cake_reporter.php +++ b/site/app/tests/cake_reporter.php @@ -88,7 +88,7 @@ class CakeHtmlReporter extends HtmlReporter { $name = str_replace('.test', '', $path); } - $link = '<a class="svn" href="http://svn.mozilla.org/addons/trunk/site/app/'.$name.'">Test Subject</a>'; + $link = '<a class="svn" href="http://git.sugarlabs.org/projects/slo-addons/repos/mainline/blobs/devel/site/app/'.$name.'">Test Subject</a>'; return $link; } } @@ -171,7 +171,7 @@ class CakeHtmlReporter extends HtmlReporter { function parseMessage($message) { if (preg_match('/(.*) at \['.str_replace(DS, '\\'.DS, TESTS).'(\S+) (line (\d+))\]/i', $message, $matches)) { $memusage = function_exists('memory_get_usage') ? memory_get_usage() : ''; // some platforms don't have that - $message = $matches[1].' @ <a href="http://svn.mozilla.org/addons/trunk/site/app/tests/'.$matches[2].'#'.$matches[4].'">'.$matches[3].'</a> ('.$memusage.')<br>'; + $message = $matches[1].' @ <a href="http://git.sugarlabs.org/projects/slo-addons/repos/mainline/blobs/devel/site/app/tests/'.$matches[2].'#'.$matches[4].'">'.$matches[3].'</a> ('.$memusage.')<br>'; } return $message; } diff --git a/site/app/tests/test_helper_web.php b/site/app/tests/test_helper_web.php index c2df68d..9b2211e 100644 --- a/site/app/tests/test_helper_web.php +++ b/site/app/tests/test_helper_web.php @@ -51,7 +51,7 @@ class WebTestHelper extends WebTestCase { * Logs in with test account info. */ function login() { - $username = 'nobody@mozilla.org'; + $username = 'nobody@sugarlabs.org'; $password = 'test'; $path = $this->actionURI('/users/login'); diff --git a/site/app/tests/views/addons/dictionaries.test.php b/site/app/tests/views/addons/dictionaries.test.php index 3bf686b..95020d9 100644 --- a/site/app/tests/views/addons/dictionaries.test.php +++ b/site/app/tests/views/addons/dictionaries.test.php @@ -53,7 +53,7 @@ class AddonDictionariesTest extends WebTestHelper { function testRemoraPage() { // just checks if the page works or not - $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected"); + $this->assertWantedPattern('/Sugar Labs Activities/i', "pattern detected"); } function testDicts() { diff --git a/site/app/tests/views/addons/display.test.php b/site/app/tests/views/addons/display.test.php index 3bc5b7f..d0c6fc9 100644 --- a/site/app/tests/views/addons/display.test.php +++ b/site/app/tests/views/addons/display.test.php @@ -82,7 +82,7 @@ class AddonTest extends WebTestHelper { function testRemoraPage() { //just checks if the page works or not - $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected"); + $this->assertWantedPattern('/Sugar Labs Activities/i', "pattern detected"); } function testDisplay() { diff --git a/site/app/tests/views/addons/home.test.php b/site/app/tests/views/addons/home.test.php index 351ce0e..ac6ebb3 100644 --- a/site/app/tests/views/addons/home.test.php +++ b/site/app/tests/views/addons/home.test.php @@ -54,7 +54,7 @@ class AddonHomeTest extends WebTestHelper { function testRemoraHome() { //just checks if the page works or not - $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected"); + $this->assertWantedPattern('/Sugar Labs Activities/i', "pattern detected"); } function testTitle() { diff --git a/site/app/tests/views/addons/plugins.test.php b/site/app/tests/views/addons/plugins.test.php index 67b4fcf..cfb163c 100644 --- a/site/app/tests/views/addons/plugins.test.php +++ b/site/app/tests/views/addons/plugins.test.php @@ -53,7 +53,7 @@ class AddonPluginsTest extends WebTestHelper { function testRemoraPage() { // just checks if the page works or not - $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected"); + $this->assertWantedPattern('/Sugar Labs Activities/i', "pattern detected"); } function testPlugins() { diff --git a/site/app/tests/views/addons/previews.test.php b/site/app/tests/views/addons/previews.test.php index 6fa4ace..10a7007 100644 --- a/site/app/tests/views/addons/previews.test.php +++ b/site/app/tests/views/addons/previews.test.php @@ -54,7 +54,7 @@ class AddonPreviewsTest extends WebTestHelper { function testRemoraPage() { // just checks if the page works or not - $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected"); + $this->assertWantedPattern('/Sugar Labs Activities/i', "pattern detected"); } function testPreviews() { diff --git a/site/app/tests/views/addons/searchengines.test.php b/site/app/tests/views/addons/searchengines.test.php index 23e6cff..815b706 100644 --- a/site/app/tests/views/addons/searchengines.test.php +++ b/site/app/tests/views/addons/searchengines.test.php @@ -53,7 +53,7 @@ class AddonSearchenginesTest extends WebTestHelper { function testRemoraPage() { // just checks if the page works or not - $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected"); + $this->assertWantedPattern('/Sugar Labs Activities/i', "pattern detected"); } function testSearchengines() { diff --git a/site/app/tests/views/addons/versions.test.php b/site/app/tests/views/addons/versions.test.php index 8c5b39e..4334e04 100644 --- a/site/app/tests/views/addons/versions.test.php +++ b/site/app/tests/views/addons/versions.test.php @@ -60,7 +60,7 @@ class AddonVersionsTest extends WebTestHelper { function testRemoraPage() { // just checks if the page works or not - $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected"); + $this->assertWantedPattern('/Sugar Labs Activities/i', "pattern detected"); } function testRssLink() { diff --git a/site/app/tests/views/admin/addons_status.test.php b/site/app/tests/views/admin/addons_status.test.php index a85d26d..150e717 100644 --- a/site/app/tests/views/admin/addons_status.test.php +++ b/site/app/tests/views/admin/addons_status.test.php @@ -12,7 +12,7 @@ class AdminAddonsStatusTest extends WebTestHelper { } function testRemoraPage() { - $this->assertWantedPattern('/Mozilla Add-ons/i', 'pattern detected'); + $this->assertWantedPattern('/Sugar Labs/i', 'pattern detected'); $this->assertResponse('200'); } diff --git a/site/app/tests/views/admin/serverstatus.test.php b/site/app/tests/views/admin/serverstatus.test.php index b54d86d..e9270d8 100644 --- a/site/app/tests/views/admin/serverstatus.test.php +++ b/site/app/tests/views/admin/serverstatus.test.php @@ -52,7 +52,7 @@ class AdminServerStatusTest extends WebTestHelper { } function testRemoraPage() { - $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected"); + $this->assertWantedPattern('/Sugar Labs Activites/i', "pattern detected"); $this->assertResponse('200'); } diff --git a/site/app/tests/views/developers/index.test.php b/site/app/tests/views/developers/index.test.php index 784947f..0b4e910 100644 --- a/site/app/tests/views/developers/index.test.php +++ b/site/app/tests/views/developers/index.test.php @@ -48,7 +48,7 @@ class DevelopersIndexTest extends WebTestHelper { function testRemoraPage() {
//just checks if the page works or not
- $this->assertWantedPattern('/My Add-ons/i', 'Header detected');
+ $this->assertWantedPattern('/My Activities/i', 'Header detected');
}
function testDisplay() {
diff --git a/site/app/tests/views/reviews/add.test.php b/site/app/tests/views/reviews/add.test.php index 86ccaba..a05a227 100644 --- a/site/app/tests/views/reviews/add.test.php +++ b/site/app/tests/views/reviews/add.test.php @@ -54,7 +54,7 @@ class ReviewsAddTest extends WebTestHelper { function testRemoraPage() { //just checks if the page works or not - $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected"); + $this->assertWantedPattern('/Sugar Labs Activities/i', "pattern detected"); } function testReviews() { diff --git a/site/app/tests/views/reviews/display.test.php b/site/app/tests/views/reviews/display.test.php index 60f6190..2282990 100644 --- a/site/app/tests/views/reviews/display.test.php +++ b/site/app/tests/views/reviews/display.test.php @@ -52,7 +52,7 @@ class AddonReviewsTest extends WebTestHelper { function testRemoraPage() { //just checks if the page works or not - $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected"); + $this->assertWantedPattern('/Sugar Labs Activities/i', "pattern detected"); } function testReviews() { diff --git a/site/app/views/compatibility/dashboard.thtml b/site/app/views/compatibility/dashboard.thtml index 38b5df4..dc4623e 100644 --- a/site/app/views/compatibility/dashboard.thtml +++ b/site/app/views/compatibility/dashboard.thtml @@ -42,12 +42,12 @@ </div> <div class="compat-box"> <div id="compat-intro"> - <h2><?=$html->image('wordmarks/firefox-'.$version.'.png', array('alt' => APP_PRETTYNAME." {$version}"))?><br /><?=___('compatibility_dashboard_center_header', 'Add-on Compatibility Center')?></h2> - <p><?=sprintf(___('compatibility_dashboard_intro', 'Be prepared for the release of %1$s with the tools and information available for the %2$s Add-ons community found below.'), APP_PRETTYNAME." {$version}", APP_PRETTYNAME)?></p> + <h2><?=$html->image('wordmarks/firefox-'.$version.'.png', array('alt' => APP_PRETTYNAME." {$version}"))?><br /><?=___('compatibility_dashboard_center_header', 'Activity Compatibility Center')?></h2> + <p><?=sprintf(___('compatibility_dashboard_intro', 'Be prepared for the release of %1$s with the tools and information available for the %2$s Activities community found below.'), APP_PRETTYNAME." {$version}", APP_PRETTYNAME)?></p> <ul> <li id="nav-report"><a href="<?=$html->url('/compatibility/report/'.$version)?>" onclick="compatibility.viewReport(); return false;"><?=___('compatibility_view_report', 'View Compatibility Report')?></a></li> - <li id="nav-developers"><a href="<?=$html->url('/compatibility/developers/'.$version)?>" onclick="compatibility.viewDeveloperInfo(); return false;"><?=___('compatibility_developer_info', 'Information for Add-on Developers')?></a></li> - <li id="nav-users"><a href="<?=$html->url('/compatibility/users/'.$version)?>" onclick="compatibility.viewEndUserInfo(); return false;"><?=___('compatibility_user_info', 'Information for Add-on Users')?></a></li> + <li id="nav-developers"><a href="<?=$html->url('/compatibility/developers/'.$version)?>" onclick="compatibility.viewDeveloperInfo(); return false;"><?=___('compatibility_developer_info', 'Information for Activity Developers')?></a></li> + <li id="nav-users"><a href="<?=$html->url('/compatibility/users/'.$version)?>" onclick="compatibility.viewEndUserInfo(); return false;"><?=___('compatibility_user_info', 'Information for Activity Users')?></a></li> </ul> </div> @@ -63,10 +63,10 @@ ?> <div class="header"> <div class="title"> - <?=$html->image('wordmarks/firefox-'.$version.'_small.png', array('alt' => APP_PRETTYNAME." {$version}"))?><?=___('compatibility_report_title', 'Add-on Compatibility Report')?> + <?=$html->image('wordmarks/firefox-'.$version.'_small.png', array('alt' => APP_PRETTYNAME." {$version}"))?><?=___('compatibility_report_title', 'Activity Compatibility Report')?> </div> </div> - <p class="intro"><?=sprintf(___('compatibility_report_intro', 'Of the %1$s add-ons that make up 95% of add-on usage known to Mozilla, <b>%2$s%</b> are currently considered compatible with the latest builds of %3$s.'), number_format($totals['addons95']), round($percentages[COMPAT_LATEST]), APP_PRETTYNAME." {$version}")?></p> + <p class="intro"><?=sprintf(___('compatibility_report_intro', 'Of the %1$s activities that make up 95% of activity usage known to Sugar Labs, <b>%2$s%</b> are currently considered compatible with the latest builds of %3$s.'), number_format($totals['addons95']), round($percentages[COMPAT_LATEST]), APP_PRETTYNAME." {$version}")?></p> <div id="overall-compat"> <div id="overall-compat-bar"> <div class="compat-other" style="width: <?=$percentages[COMPAT_OTHER]?>%;"><?=($percentages[COMPAT_OTHER] >= 5 ? round($percentages[COMPAT_OTHER]).'%': '')?></div> @@ -78,19 +78,19 @@ <div id="overall-compat-legend"> <div class="legend-box"> <div class="color-square compat-other"></div> - <p><b><?=___('compatibility_report_legend_other', 'Other Versions')?></b><br /><?=sprintf(___('compatibility_report_legend_other_description', 'Add-ons not compatible with any version of %1$s'), APP_PRETTYNAME." {$version}")?></p> + <p><b><?=___('compatibility_report_legend_other', 'Other Versions')?></b><br /><?=sprintf(___('compatibility_report_legend_other_description', 'Activities not compatible with any version of %1$s'), APP_PRETTYNAME." {$version}")?></p> </div> <div class="legend-box"> <div class="color-square compat-alpha"></div> - <p><b><?=___('compatibility_report_legend_alpha', 'Alpha Versions')?></b><br /><?=sprintf(___('compatibility_report_legend_alpha_description', 'Add-ons compatible with an alpha version of %1$s'), APP_PRETTYNAME." {$version}")?></p> + <p><b><?=___('compatibility_report_legend_alpha', 'Alpha Versions')?></b><br /><?=sprintf(___('compatibility_report_legend_alpha_description', 'Activities compatible with an alpha version of %1$s'), APP_PRETTYNAME." {$version}")?></p> </div> <div class="legend-box"> <div class="color-square compat-beta"></div> - <p><b><?=___('compatibility_report_legend_beta', 'Beta Versions')?></b><br /><?=sprintf(___('compatibility_report_legend_beta_description', 'Add-ons compatible with a beta version or release candidate of %1$s'), APP_PRETTYNAME." {$version}")?></p> + <p><b><?=___('compatibility_report_legend_beta', 'Beta Versions')?></b><br /><?=sprintf(___('compatibility_report_legend_beta_description', 'Activities-ons compatible with a beta version or release candidate of %1$s'), APP_PRETTYNAME." {$version}")?></p> </div> <div class="legend-box"> <div class="color-square compat-latest"></div> - <p><b><?=___('compatibility_report_legend_latest', 'Latest Version')?></b><br /><?=sprintf(___('compatibility_report_legend_latest_description', 'Add-ons up-to-date with the latest builds of %1$s'), APP_PRETTYNAME." {$version}")?></p> + <p><b><?=___('compatibility_report_legend_latest', 'Latest Version')?></b><br /><?=sprintf(___('compatibility_report_legend_latest_description', 'Activities up-to-date with the latest builds of %1$s'), APP_PRETTYNAME." {$version}")?></p> </div> </div> </div> @@ -111,7 +111,7 @@ <div id="developers-intro"> <div class="header"> <div class="title"> - <?=$html->image('wordmarks/firefox-'.$version.'_small.png')?><?=___('compatibility_developer_info', 'Information for Add-on Developers')?> + <?=$html->image('wordmarks/firefox-'.$version.'_small.png')?><?=___('compatibility_developer_info', 'Information for Activity Developers')?> </div> </div> <br /> @@ -127,7 +127,7 @@ <?php if ($loggedin): ?> <div class="details-link"><a href="#" onclick="compatibility.viewDeveloperDetails();"><?=___('compatibility_developers_check_status', 'Check Status of My Add-ons')?></a></div> <?php else: ?> - <p class="login"><?=sprintf(___('compatibility_developers_login_first', 'If you have add-ons hosted on Mozilla Add-ons, <a href="%1$s">please login</a> to analyze the status of your add-ons for %2$s.'), $html->url($html->login_url()), APP_PRETTYNAME." {$version}")?></p> + <p class="login"><?=sprintf(___('compatibility_developers_login_first', 'If you have activities hosted on Sugar Labs Activites, <a href="%1$s">please login</a> to analyze the status of your activitiess for %2$s.'), $html->url($html->login_url()), APP_PRETTYNAME." {$version}")?></p> <?php endif; ?> </div> @@ -138,14 +138,14 @@ </div> </div> - <div class="loading"><?=___('compatibility_developers_retrieving', 'Retrieving status of hosted add-ons...')?></div> + <div class="loading"><?=___('compatibility_developers_retrieving', 'Retrieving status of hosted activities...')?></div> <div id="developers-details-data"></div> </div> <div id="users-intro"> <div class="header"> <div class="title"> - <?=$html->image('wordmarks/firefox-'.$version.'_small.png')?><?=___('compatibility_user_info', 'Information for Add-on Users')?> + <?=$html->image('wordmarks/firefox-'.$version.'_small.png')?><?=___('compatibility_user_info', 'Information for Activity Users')?> </div> </div> <br /> diff --git a/site/app/views/compatibility/developers.thtml b/site/app/views/compatibility/developers.thtml index 5b4ae0c..3e208f4 100644 --- a/site/app/views/compatibility/developers.thtml +++ b/site/app/views/compatibility/developers.thtml @@ -68,11 +68,11 @@ if ($loggedin) { echo '</ul>'; } else { - echo '<p class="login">'.___('compatibility_developers_no_addons', 'You do not have any add-ons hosted on Mozilla Add-ons.').'</p>'; + echo '<p class="login">'.___('compatibility_developers_no_addons', 'You do not have any activities hosted on Sugar Labs Activites.').'</p>'; } } else { - echo '<p class="login">'.sprintf(__('compatibility_developers_login_first', 'If you have add-ons hosted on Mozilla Add-ons, <a href="%1$s">please login</a> to analyze the status of your add-ons for %2$s.'), $html->url($html->login_url()), APP_PRETTYNAME." {$version}").'</p>'; + echo '<p class="login">'.sprintf(__('compatibility_developers_login_first', 'If you have activities hosted on Sugar Labs Activities, <a href="%1$s">please login</a> to analyze the status of your activity for %2$s.'), $html->url($html->login_url()), APP_PRETTYNAME." {$version}").'</p>'; } ?> <?php if ($format != 'ajax'): ?> diff --git a/site/app/views/facebook/faq.thtml b/site/app/views/facebook/faq.thtml index 55b1cad..65c1ff8 100644 --- a/site/app/views/facebook/faq.thtml +++ b/site/app/views/facebook/faq.thtml @@ -66,57 +66,48 @@ <h1>Frequently Asked Questions</h1> <div class="entry"> - <div class="question">What exactly is an add-on, and why should I download one?</div> - <div class="answer">Add-ons let you Rock Your Firefox by adding new features or changing the appearance of your Firefox. - For example, you can give your browser a whole new look with specially created themes. - Or you can try add-ons that will enhance listening to music, simplify photo sharing, block popup ads, and more.</div> + <div class="question">What exactly is an activity, and why should I download one?</div> + <div class="answer">Activities let you Rock Your Sugar by adding new features or changing the appearance of your computer. </div> <div class="entry"> - <div class="question">What is the difference between putting an add-on on my favorites list and actually installing the add-on for my Firefox?</div> - <div class="answer">Marking an add-on as a favorite lets your friends know that you use and recommend the add-on, but does not automatically install it. - Similarly, installing an add-on does not automatically mark it as a favorite.</div> + <div class="question">What is the difference between putting an activities on my favorites list and actually installing the activity for my sugar?</div> + <div class="answer">Marking an activity as a favorite lets your friends know that you use and recommend the acttivity, but does not automatically install it. + Similarly, installing an aativity does not automatically mark it as a favorite.</div> </div> <div class="entry"> <div class="question">I want to show my favorite add-ons on my profile. How do I do this?</div> - <div class="answer">Clicking "Add to Favorites" on an add-on's display page will add it to your favorites and make it appear in your Facebook profile.</div> + <div class="answer">Clicking "Add to Favorites" on an activities' display page will add it to your favorites and make it appear in your Facebook profile.</div> </div> <div class="entry"> - <div class="question">How do I share a cool add-on with my friends? (i.e. Can I invite people to add something?)</div> - <div class="answer">You can use the Share button on an addon's display page to share that add-on with a specific friend or post it on your profile. - You'll also be able to send add-ons as attachments in wall posts and messages very soon, so they can Rock their Firefox.</div> + <div class="question">How do I share a cool activities with my friends? (i.e. Can I invite people to add something?)</div> + <div class="answer">You can use the Share button on an activities's display page to share that activity with a specific friend or post it on your profile. + You'll also be able to send activities as attachments in wall posts and messages very soon, so they can Rock their Sugar.</div> </div> <div class="entry"> - <div class="question">I've installed an add-on. What's my next step to actually start using it?</div> - <div class="answer">Once you install an add-on, you'll need to restart Firefox for it to take effect. - If the add-on doesn't seem to have installed properly, go the Add-ons Manager in the Firefox tools menu to learn more.</div> + <div class="question">I've installed an activity. What's my next step to actually start using it?</div> + <div class="answer">If the activity doesn't seem to have installed properly, go the Activity Manager to learn more.</div> </div> <div class="entry"> - <div class="question">Is this application secure? Are these add-ons certified by Mozilla?</div> - <div class="answer">The add-ons listed in Rock Your Firefox were not made by Mozilla (unless otherwise noted). - It's best to check with the author of the add-on (listed next to each add-on description) for any support requests.</div> + <div class="question">Is this activity secure? Are these activities certified by Sugar Labs?</div> + <div class="answer">The activities listed in Rock Your Fugar were not made by Sugar Labs (unless otherwise noted). + It's best to check with the author of the activity (listed next to each add-on description) for any support requests.</div> </div> <div class="entry"> - <div class="question">Why do I need Firefox to use this Facebook application?</div> - <div class="answer">This application lets you Rock Your Firefox! - Only Firefox gives you the chance to customize nearly every aspect of your browser. - Find out what Firefox add-ons your friends are using and discover new favorites on your own.</div> + <div class="question">Why do I need Sugar to use this Facebook application?</div> + <div class="answer">This application lets you Rock Your Sugar! + Only Firefox gives you the chance to customize nearly every aspect of your desktop. + Find out what Sugar activites your friends are using and discover new favorites on your own.</div> </div> <div class="entry"> - <div class="question">Where can I find more information about Firefox extensions and themes?</div> - <div class="answer">You can submit and learn more about creating add-ons for Firefox at <a href="<?=SITE_URL?>">Mozilla Add-ons</a>. - Submitting your add-on in the <a href="<?=SITE_URL?>/developers">Developer Control Panel</a> there will enable it to be listed in Rock Your Firefox.</div> - </div> - - <div class="entry"> <div class="question">Where can I report a bug or enhancement request with this application?</div> <div class="answer">If you think you've found an issue with this application, or if you'd like to request a new feature, - please do so in Mozilla's <a href="https://bugzilla.mozilla.org/enter_bug.cgi?product=addons.mozilla.org&component=Facebook%20Application&op_sys=All&rep_platform=All">Bugzilla</a>.</div> + please do so in Sugar Lab's bugtracker.</div> </div> </div>
\ No newline at end of file diff --git a/site/app/views/facebook/import.thtml b/site/app/views/facebook/import.thtml index 08143f5..0b5436c 100644 --- a/site/app/views/facebook/import.thtml +++ b/site/app/views/facebook/import.thtml @@ -165,7 +165,7 @@ if ($action == 'results') { <div class="frame"> <h1>Detect Installed Add-ons</h1> <p>Select the add-ons below that you'd like to add to your list of favorite add-ons.<br><a href="#" onClick="document.getElementById('missing-addons').style.display=''; this.style.display='none';">Why are some of my add-ons missing?</a></p> - <p id="missing-addons" style="display: none;">If some of your installed add-ons aren't detected, it's probably because they are not hosted on <a href="<?=SITE_URL?>">Mozilla Add-ons</a>. Only add-ons hosted on <a href="<?=SITE_URL?>">Mozilla Add-ons</a> can be detected and listed in Rock Your Firefox.</p> + <p id="missing-addons" style="display: none;">If some of your installed add-ons aren't detected, it's probably because they are not hosted on <a href="<?=SITE_URL?>">Sugar Labs Activities</a>. Only add-ons hosted on <a href="<?=SITE_URL?>">Sugar Labs Activities</a> can be detected and listed in Rock Your Sugar.</p> <form action="<?=SITE_URL.$html->url('/facebookinstall/import/'.$fbUserSession.'/favorites')?>" method="post" id="form"> <table id="addons" width="100%"> <tr><td width="50%" valign="top"> diff --git a/site/app/views/facebook/view.thtml b/site/app/views/facebook/view.thtml index ddc9442..421109b 100644 --- a/site/app/views/facebook/view.thtml +++ b/site/app/views/facebook/view.thtml @@ -216,7 +216,7 @@ <div class="profileActions clearfix"> <?=(!empty($addon['Translation']['privacypolicy']['string']) ? '<a href="#" clicktotoggle="privacypolicy">Privacy Policy</a>' : '')?> <?=(!empty($addon['Translation']['homepage']['string']) ? '<a href="'.$addon['Translation']['homepage']['string'].'" target="_blank">Add-on Homepage</a>' : '')?> - <a href="<?=SSITE_URL?>/addon/<?=$addon['Addon']['id']?>">Mozilla Add-ons Listing</a> + <a href="<?=SSITE_URL?>/addon/<?=$addon['Addon']['id']?>">Sugar Labs Activities Listing</a> </div> <div class="header"><h2>Recommended By</h2></div> diff --git a/site/app/views/layouts/ajax_with_css.thtml b/site/app/views/layouts/ajax_with_css.thtml index 119b787..f95ad0c 100644 --- a/site/app/views/layouts/ajax_with_css.thtml +++ b/site/app/views/layouts/ajax_with_css.thtml @@ -45,7 +45,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <base target="_top"> <?=$html->css('rustico')?> - <link rel="search" type="application/opensearchdescription+xml" href="<?=$html->url('/AMOSearch.xml', null, false)?>" title="Mozilla Add-ons" /> + <link rel="search" type="application/opensearchdescription+xml" href="<?=$html->url('/AMOSearch.xml', null, false)?>" title="Sugar Labs Activities" /> <link rel="shortcut icon" href="<?=$html->url('/img/favicon.ico', null, false)?>" type="image/x-icon" /> <?php if (!empty($cssAdd)) { diff --git a/site/app/views/layouts/mozilla.thtml b/site/app/views/layouts/mozilla.thtml index d2d3162..31a422b 100644 --- a/site/app/views/layouts/mozilla.thtml +++ b/site/app/views/layouts/mozilla.thtml @@ -84,7 +84,7 @@ } ?> - <link rel="search" type="application/opensearchdescription+xml" href="<?=$html->url('/AMOSearch.xml', null, false, false)?>" title="Mozilla Add-ons"/> + <link rel="search" type="application/opensearchdescription+xml" href="<?=$html->url('/AMOSearch.xml', null, false, false)?>" title="Sugar Labs Activities"/> <?php if (isset($addon) && ($addon['Addon']['addontype_id'] == ADDON_SEARCH)) : ?> <link rel="search" type="application/opensearchdescription+xml" href="<?=$html->urlFile($addon['Version'][0]['File'][0]['id'], $addon['Version'][0]['File'][0]['filename'])?>" locale="<?=$addon['Translation']['name']['locale']?>" title="<?=$addon['Translation']['name']['string']?>"/> <?php endif; ?> diff --git a/site/app/views/layouts/rss.thtml b/site/app/views/layouts/rss.thtml index e0b9232..bbcdb84 100644 --- a/site/app/views/layouts/rss.thtml +++ b/site/app/views/layouts/rss.thtml @@ -7,7 +7,7 @@ <language><?=strtolower(LANG) ?></language> <pubDate><?=$time->toRss(gmmktime()) ?></pubDate> <docs>http://blogs.law.harvard.edu/tech/rss</docs> - <generator>Mozilla Add-ons</generator> + <generator>Sugar Labs Activities</generator> <?php echo $content_for_layout; ?> diff --git a/site/app/views/users/delete.thtml b/site/app/views/users/delete.thtml index 95e74ac..60297e3 100644 --- a/site/app/views/users/delete.thtml +++ b/site/app/views/users/delete.thtml @@ -68,7 +68,7 @@ echo '</p>'; echo sprintf(___('user_del_error_addons_more_questions', 'If you ' .'have additional questions, please contact %1$s for assistance.'), - $link->email('amo-editors@mozilla.org')); + $link->email('aslo-editors@sugarlabs.org')); break; case 'checkbox': echo ___('user_del_error_checkbox', 'You need to check the box "I ' @@ -92,12 +92,12 @@ <h1><?php echo sprintf(___('user_del_header_delete_account', 'Delete User Account %s'), $useremail)?></h1> - <p><?=___('user_del_community_sad', 'The Mozilla Add-ons community is sad to see you go.')?></p> + <p><?=___('user_del_community_sad', 'The Sugar Labs Activity community is sad to see you go.')?></p> <p><?php sprintf(___('user_del_specific_problem_editors', 'If you have a ' .'specific problem we may help you with, please do not delete your account ' .'now, but contact us at %1$s and we will do our best to assist you in ' - .'solving it.'), $link->email('amo-editors@mozilla.org'))?></p> + .'solving it.'), $link->email('aslo-editors@sugarlabs.org'))?></p> <div class="corner-box"> <h2><?=___('user_del_header_confirm_deletion', 'Confirm account deletion')?></h2> @@ -105,7 +105,7 @@ <p><?=___('user_del_permanently_removed_means', 'By clicking "delete" your ' .'account is going to be <strong>permanently removed</strong>. That means:')?> <ul> - <li><?=___('user_del_nologin', 'You will not be able to log into Mozilla Add-ons anymore.')?></li> + <li><?=___('user_del_nologin', 'You will not be able to log into Sugar Labs Activities anymore.')?></li> <li><?=___('user_del_reviews_anonymized', 'Your reviews and ratings will ' .'not be deleted, but they will no longer be associated with you.')?></li> </ul> diff --git a/site/app/webroot/AMOSearch.xml b/site/app/webroot/AMOSearch.xml index 1feba30..f10422b 100644 --- a/site/app/webroot/AMOSearch.xml +++ b/site/app/webroot/AMOSearch.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> - <ShortName>Mozilla Add-ons</ShortName> + <ShortName>Sugar Labs Activities</ShortName> <Url type="text/html" method="get" - template="http://addons.mozilla.org/search/?q={searchTerms}"> + template="http://activities.sugarlabs.org/search/?q={searchTerms}"> </Url> <Image height="16" width="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz%0D%0AAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAKoSURB%0D%0AVDiNjZNLaJRnFIaf75vvy2UGTWr8NYkxl0IFUYkNXSSZQNWFWlxIEVy1FLLo0i4adddVXRnS4kJw%0D%0AYxci2GaRTWlSFGKFGRXNmFBF62VMO4TENBdjMv9k5p%2F%2FOy4SLzgqHs7yPc95eTlHiQjvqniPbVYR%0D%0AzuBoR%2BFQDEvId4neIPNCY945DayNVff%2F8NUvn9XXNJMv5hhKnTvYP3ymHmj%2FIMBSbmHjjP8fycxv%0D%0A%2BMEzGqtatUI1vK7R7wM4J32XUv3Li%2Fl5imGBkbtXlsMw%2FPF1jXozg3iP3aM0Z8XRBFDr1fl7Og9E%0D%0AnTguXx30p%2F6fjAIozb%2Fi6C4BdB2z6QOfH27ZUFNL0QUELs%2Ftycs4J2zdGEerCADTM1P8df3PxyUZ%0D%0AiKPF8zyGHpwGFLC6QCCRuYA4QQQ6mw4hjhYT77GN2qiBWFnV5sXc0xMAgfKx5foVYKURB2vLPbxo%0D%0AM8auODE6ws%2FfH%2B77dHtjhxp5OHzywpWf%2FIIsRk25Rq0CRFY4UVNNndkmqZFRf3YuWaYUS0aE3RP5%0D%0AMXX3%2FiCOgu3Y1WYfL90sdSDgxRoYTY5mZ2anjwC%2FAqEBdM4tMJ4dwYs1YiOGSBkYrVHqlQNxoC34%0D%0AOV8BdxK9gQ%2Bguo7bwdYdrXu92nU6nR7Pzc%2FPSXxfazTj30IpRaWpIqbX4UQoBDkWJlRwLzVeLBTy%0D%0AGs2UcUX5duzvsfPqNpvDovQhnBIdELGaWFk1hclYmLx2fxmFbNm5qXJNvdi2DQ1WAsO1P%2F5petsh%0D%0Ayf6v25gJ0nxUUUeiP531s%2FkvAcor7MDOL2pjz3JzVKpqUoMTpb8QsSqdeTT98fomjyDv8LP5aKI3%0D%0AuAgQP2orCkGAVRVMZxbQhnQJIAzkm3s3Js6GSfkEQEd4%2Bbpa8%2BTW71P1ANqoB65I93OA2DgV%2BZ%2Bo%0D%0AmgAAAABJRU5ErkJggg%3D%3D</Image> <OutputEncoding>UTF-8</OutputEncoding> |