Skip to content

Commit

Permalink
Changed module name
Browse files Browse the repository at this point in the history
  • Loading branch information
codephunk committed Apr 1, 2012
1 parent f95d090 commit 6e6d2a5
Show file tree
Hide file tree
Showing 13 changed files with 56 additions and 56 deletions.
Expand Up @@ -25,7 +25,7 @@ class Hackathon_DiscountForATweet_Model_Condition_Tweet extends Mage_Rule_Model_
*/
public function loadAttributeOptions() {
$attributes = array(
'tweetContent' => Mage::helper('hackathon_discountforatweet')->__('Tweet content')
'tweetContent' => Mage::helper('discountforatweet')->__('Tweet content')
);

$this->setAttributeOption($attributes);
Expand Down
Expand Up @@ -57,7 +57,7 @@ function addConditionToSalesRule($observer)
$additional = $observer->getAdditional();
$conditions = (array) $additional->getConditions();
$conditions = array_merge_recursive($conditions, array(
array('label'=>Mage::helper('hackathon_discountforatweet')->__('Tweeted about'), 'value'=>'hackathon_discountforatweet/condition_tweet'),
array('label'=>Mage::helper('discountforatweet')->__('Tweeted about'), 'value'=>'discountforatweet/condition_tweet'),
));
$additional->setConditions($conditions);
$observer->setAdditional($additional);
Expand Down
72 changes: 36 additions & 36 deletions app/code/community/Hackathon/DiscountForATweet/etc/config.xml
Expand Up @@ -52,49 +52,49 @@
<frontend>
<translate>
<modules>
<hackathon_discountforatweet>
<discountforatweet>
<files>
<default>Hackathon_DiscountForATweet.csv</default>
<default>DiscountForATweet.csv</default>
</files>
</hackathon_discountforatweet>
</discountforatweet>
</modules>
</translate>
<routers>
<hackathon_discountforatweet>
<discountforatweet>
<use>standard</use>
<args>
<module>Hackathon_DiscountForATweet</module>
<frontName>hackathon_discountforatweet</frontName>
<frontName>discountforatweet</frontName>
</args>
</hackathon_discountforatweet>
</discountforatweet>
</routers>
<layout>
<updates>
<hackathon_discountforatweet>
<file>hackathon_discountforatweet.xml</file>
</hackathon_discountforatweet>
<discountforatweet>
<file>discountforatweet.xml</file>
</discountforatweet>
</updates>
</layout>
</frontend>
<admin>
<routers>
<hackathon_discountforatweet>
<discountforatweet>
<use>admin</use>
<args>
<module>Hackathon_DiscountForATweet</module>
<frontName>admin_hackathon_discountforatweet</frontName>
<frontName>admin_discountforatweet</frontName>
</args>
</hackathon_discountforatweet>
</discountforatweet>
</routers>
</admin>
<adminhtml>
<translate>
<modules>
<hackathon_discountforatweet>
<discountforatweet>
<files>
<default>Hackathon_DiscountForATweet.csv</default>
<default>DiscountForATweet.csv</default>
</files>
</hackathon_discountforatweet>
</discountforatweet>
</modules>
</translate>
<acl>
Expand All @@ -105,10 +105,10 @@
<children>
<config>
<children>
<hackathon_discountforatweet translate="title" module="hackathon_discountforatweet">
<discountforatweet translate="title" module="discountforatweet">
<title>DiscountForATweet</title>
<sort_order>50</sort_order>
</hackathon_discountforatweet>
</discountforatweet>
</children>
</config>
</children>
Expand All @@ -119,59 +119,59 @@
</acl>
<layout>
<updates>
<hackathon_discountforatweet>
<file>hackathon_discountforatweet.xml</file>
</hackathon_discountforatweet>
<discountforatweet>
<file>discountforatweet.xml</file>
</discountforatweet>
</updates>
</layout>
</adminhtml>
<global>
<models>
<hackathon_discountforatweet>
<discountforatweet>
<class>Hackathon_DiscountForATweet_Model</class>
<resourceModel>hackathon_discountforatweet_resource</resourceModel>
</hackathon_discountforatweet>
<hackathon_discountforatweet_resource>
<resourceModel>discountforatweet_resource</resourceModel>
</discountforatweet>
<discountforatweet_resource>
<class>Hackathon_DiscountForATweet_Model_Resource</class>
<entities/>
</hackathon_discountforatweet_resource>
</discountforatweet_resource>
</models>
<resources>
<hackathon_discountforatweet_setup>
<discountforatweet_setup>
<setup>
<module>Hackathon_DiscountForATweet</module>
<class>Hackathon_DiscountForATweet_Model_Resource_Setup</class>
</setup>
<connection>
<use>core_setup</use>
</connection>
</hackathon_discountforatweet_setup>
<hackathon_discountforatweet_write>
</discountforatweet_setup>
<discountforatweet_write>
<connection>
<use>core_write</use>
</connection>
</hackathon_discountforatweet_write>
<hackathon_discountforatweet_read>
</discountforatweet_write>
<discountforatweet_read>
<connection>
<use>core_read</use>
</connection>
</hackathon_discountforatweet_read>
</discountforatweet_read>
</resources>
<blocks>
<hackathon_discountforatweet>
<discountforatweet>
<class>Hackathon_DiscountForATweet_Block</class>
</hackathon_discountforatweet>
</discountforatweet>
</blocks>
<helpers>
<hackathon_discountforatweet>
<discountforatweet>
<class>Hackathon_DiscountForATweet_Helper</class>
</hackathon_discountforatweet>
</discountforatweet>
</helpers>
<events>
<salesrule_rule_condition_combine>
<observers>
<add_condition_to_sales_rule>
<class>hackathon_discountforatweet/observer</class>
<class>discountforatweet/observer</class>
<method>addConditionToSalesRule</method>
</add_condition_to_sales_rule>
</observers>
Expand Down
4 changes: 2 additions & 2 deletions app/code/community/Hackathon/DiscountForATweet/etc/system.xml
Expand Up @@ -51,7 +51,7 @@
</hackathon>
</tabs>
<sections>
<hackathon_discountforatweet translate="label" module="hackathon_discountforatweet">
<discountforatweet translate="label" module="discountforatweet">
<label>DiscountForATweet</label>
<tab>hackathon</tab>
<sort_order>130</sort_order>
Expand All @@ -68,6 +68,6 @@
<show_in_store>1</show_in_store>
</general>
</groups>
</hackathon_discountforatweet>
</discountforatweet>
</sections>
</config>
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<widgets>
<Hackathon_TweetWidget type="hackathon_discountforatweet/tweetWidget" translate="name description" module="hackathon_discountforatweet">
<Hackathon_TweetWidget type="discountforatweet/tweetWidget" translate="name description" module="discountforatweet">
<name>Tweet Button</name>
<description type="desc">Shows a button to tweet for a certain salesrule</description>
<parameters>
Expand Down
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
/**
* hackathon_discountforatweet.xml
* discountforatweet.xml
*
* Layout settings for backend.
*
Expand Down Expand Up @@ -35,7 +35,7 @@
*/
/**
* hackathon_discountforatweet.xml
* discountforatweet.xml
*
* Layout settings for backend.
*
Expand Down
@@ -0,0 +1,8 @@
<?xml version="1.0"?>
<layout version="0.1.0">
<discountforatweet_index_index>
<reference name="content">
<block type="discountforatweet/tweetapp" name="tweetapp" template="hackathon/discountforatweet/tweetapp.phtml" />
</reference>
</discountforatweet_index_index>
</layout>

This file was deleted.

File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions modman
@@ -1,13 +1,13 @@
# Config-File
app/etc/modules/Hackathon_DiscountForATweet.xml app/etc/modules/Hackathon_DiscountForATweet.xml
app/etc/modules/DiscountForATweet.xml app/etc/modules/DiscountForATweet.xml
# App Files
app/code/community/Hackathon/DiscountForATweet app/code/community/Hackathon/DiscountForATweet
# Adminhtml-Layout-XML
app/design/adminhtml/default/default/layout/hackathon_discountforatweet.xml app/design/adminhtml/default/default/layout/hackathon_discountforatweet.xml
app/design/adminhtml/default/default/layout/discountforatweet.xml app/design/adminhtml/default/default/layout/discountforatweet.xml
# Frontend-Layout-XML
app/design/frontend/default/default/layout/hackathon_discountforatweet.xml app/design/frontend/default/default/layout/hackathon_discountforatweet.xml
app/design/frontend/default/default/layout/discountforatweet.xml app/design/frontend/default/default/layout/discountforatweet.xml
# Frontend Templates
app/design/frontend/default/default/template/hackathon/discountforatweet/ app/design/frontend/default/default/template/hackathon/discountforatweet/
# Locale
app/locale/de_DE/Hackathon_DiscountForATweet.csv app/locale/de_DE/Hackathon_DiscountForATweet.csv
app/locale/en_US/Hackathon_DiscountForATweet.csv app/locale/en_US/Hackathon_DiscountForATweet.csv
app/locale/de_DE/DiscountForATweet.csv app/locale/de_DE/DiscountForATweet.csv
app/locale/en_US/DiscountForATweet.csv app/locale/en_US/DiscountForATweet.csv

0 comments on commit 6e6d2a5

Please sign in to comment.