Merge remote-tracking branch 'origin/develop' into feature/WISE-214-JasmineTests

This commit is contained in:
Ezequiel Bergamaschi 2014-09-25 03:10:05 -03:00
commit 3026504110
180 changed files with 10933 additions and 11486 deletions

View File

@ -6,42 +6,5 @@ INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (2, 'admin@wisemappin
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (2, 'Admin', 'User', 'admin', 1237, CURDATE(), 1,'D');
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (3, 'homer@wisemapping.org', CURDATE());
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (3, 'Homer', 'Simpson', 'homer', 1237, CURDATE(), 1, 'D');
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (4, 'marge@wisemapping.org', CURDATE());
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (4, 'Marge', 'Bouvier', 'marge', 1237, CURDATE(), 1, 'D');
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (5, 'bart@wisemapping.org', CURDATE());
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (5, 'Bart', 'Simpson', 'bart', 1237, CURDATE(), 1, 'D');
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (6, 'lisa@wisemapping.org', CURDATE());
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (6, 'Lisa', 'Simpson', 'lisa', 1237, CURDATE(), 1, 'D');
INSERT INTO MINDMAP (id, title, xml, description, public, creation_date, edition_date, creator_id, tags, last_editor_id)
VALUES (1, 'Welcome Test', x'504B0304140008080800ED036F4400000000000000000000000007000000636F6E74656E74AD57DD8EDA3814BEEF53B8E9452F360CF985B0C0542C43D5B960355259ED45558D9CC464AC3176E43843A76FB3CFD0479817DB1393F0938442871A09417EFC7DE7F83BDFB1472B9C228E57646CE4194E88819E88CCA8E06343619E08E3FA0D82315222A5118A08571233B827737854916F6A6C4CC54A20F822FC3B96E88381683C366C032D05579FD53383A987C377448FE17068A030990A26E4D8786761F8042586C6A191E07A828C26FCFE81B0D4E8EEDDDED048454695E668F76DB3E3590612322630A35591BA93F02489714C321413B478F9012F8AAC24D760E7E95163E7F856485C638B5E8E506EE90796EF0FF6E8B78410611E11B61F446B20CEC0373B03671B885D053249244920AF7F0B854BFAAE5D83D43372A1C8F5E8ED97E9CD6431F932CB9440107BCEB17E15BDFDFAF57AD4D50F1D32E96A2A27E8B90EE4D9B68366A22B7E33CE70048018DDE184729CA17F49B8E1DB3F9EED963818E58F289720B207A5D23FBBDDF57A7D9508913072158915E03EA7855A6533A9E785625B108AB78DC4AD2299E74CD194410C903CCA8416CEC71C244F1A1A28865E0AA72D843AA46739ED2AD5422A17D5AD6769B9B4601459EA9E8B61BB4D0195C194287E0D65180A160FA9C28C46E70259A6BD13AA53E12C687A90B20D5EEF006F4157241BF6862D419DB97810A5BB53A157817F14720592BBA14B220B7408377BC0854E24891406ED6CF804AD2B794C9DA78B36303BBD5E3317B7600155CA3DB74D225B935842D5DCAF41F32713D2BC50E7D3B18343423B11C434A22F3F38FA27C33C0667606841228663B121E938C76BB4E17F5B83C4716C2FFB47FDEF01CBF8FE913C87027E9C4C66C7F582C26306FB65A2B9F57EC93F8A80773E38174F4411702725775D00BA15473386A6B9CC84D4C6A8DF7A85203BAE0FCE18047B296F53D8B653D2A24B8249CEB248D2904A704B09FF62A84009660DABF24D556BE2FD56B102D3BED9290CA06E7C7792141DBF303E281D89D28252E5EB05A74DDAD0270245C6C5513374EAE6F24BECFA60CBBD165F29D96134559275E744E13FDA697ECEC38AEA718ACD767E614EA16DB7F8D1FCE5BF0C7DB8429FA0BA5104DEFA882847EF2711B4C8C22569614B227B8FB00419E0CD82FBD6C15EE764B9DBAE670E5A32063283DC285A76969F94CF5E2DC35E295C2EEBB5DC703CDF357B7EB391DDF22750309AAC68228A3D00CC8A4321714961F07A61384ECF6CDB17CD562109410584A3BF9848AA9D9D750112D4C7BEFDEC149887B08218A91CCD715AEDC2ECF3D47E8E6BF703B36F37EB529BB6D87AF65CE459D9C65EE5D6F120F4EDE0E76EBDD218A765EFF44DC7A91BB577814FDF88901134D595024BBAE73AE99E416A77BCD0AF3DDBF4FBFB7AD2FB94DF475DF39D4A52D02DFBCD858C21D98765AECDE202C61329710607B95D43D4A4EF00B3101CBEB425BA3DD821BA4D418390F5CE43081656D6E0F48F56CBE11F49182E00B2079AA24C468BE2DE6DB97781639EDA5D30101C22C8429F13009CF0182216EBEAD89A819454796589D946F0A32E9C84AFDFFC0F504B070890C15C185C040000100F0000504B01021400140008080800ED036F4490C15C185C040000100F0000070000000000000000000000000000000000636F6E74656E74504B0506000000000100010035000000910400000000', '', 0, now(), now(), 1, NULL, 1);
INSERT INTO COLLABORATION_PROPERTIES (id, starred, mindmap_properties) VALUES (1, 0, '{zoom:0.8}');
INSERT INTO COLLABORATION (id, colaborator_id, properties_id, mindmap_id, role_id) VALUES (1, 1, 1, 1, 0);
INSERT INTO COLLABORATION_PROPERTIES (id, starred, mindmap_properties) VALUES (2, 1, '{zoom:0.8}');
INSERT INTO COLLABORATION (id, colaborator_id, properties_id, mindmap_id, role_id) VALUES (2, 2, 2, 1, 1);
INSERT INTO LABEL (id, title, creator_id, parent_label_id, color) VALUES (1, 'test label', 1, NULL, '#ff0000');
INSERT INTO R_LABEL_MINDMAP (label_id, mindmap_id) VALUES (1,1);
INSERT INTO MINDMAP (id, title, xml, description, public, creation_date, edition_date, creator_id, tags, last_editor_id)
VALUES (2, 'Welcome Admin', x'504B0304140008080800ED036F4400000000000000000000000007000000636F6E74656E74AD57DD8EDA3814BEEF53B8E9452F360CF985B0C0542C43D5B960355259ED45558D9CC464AC3176E43843A76FB3CFD0479817DB1393F0938442871A09417EFC7DE7F83BDFB1472B9C228E57646CE4194E88819E88CCA8E06343619E08E3FA0D82315222A5118A08571233B827737854916F6A6C4CC54A20F822FC3B96E88381683C366C032D05579FD53383A987C377448FE17068A030990A26E4D8786761F8042586C6A191E07A828C26FCFE81B0D4E8EEDDDED048454695E668F76DB3E3590612322630A35591BA93F02489714C321413B478F9012F8AAC24D760E7E95163E7F856485C638B5E8E506EE90796EF0FF6E8B78410611E11B61F446B20CEC0373B03671B885D053249244920AF7F0B854BFAAE5D83D43372A1C8F5E8ED97E9CD6431F932CB9440107BCEB17E15BDFDFAF57AD4D50F1D32E96A2A27E8B90EE4D9B68366A22B7E33CE70048018DDE184729CA17F49B8E1DB3F9EED963818E58F289720B207A5D23FBBDDF57A7D9508913072158915E03EA7855A6533A9E785625B108AB78DC4AD2299E74CD194410C903CCA8416CEC71C244F1A1A28865E0AA72D843AA46739ED2AD5422A17D5AD6769B9B4601459EA9E8B61BB4D0195C194287E0D65180A160FA9C28C46E70259A6BD13AA53E12C687A90B20D5EEF006F4157241BF6862D419DB97810A5BB53A157817F14720592BBA14B220B7408377BC0854E24891406ED6CF804AD2B794C9DA78B36303BBD5E3317B7600155CA3DB74D225B935842D5DCAF41F32713D2BC50E7D3B18343423B11C434A22F3F38FA27C33C0667606841228663B121E938C76BB4E17F5B83C4716C2FFB47FDEF01CBF8FE913C87027E9C4C66C7F582C26306FB65A2B9F57EC93F8A80773E38174F4411702725775D00BA15473386A6B9CC84D4C6A8DF7A85203BAE0FCE18047B296F53D8B653D2A24B8249CEB248D2904A704B09FF62A84009660DABF24D556BE2FD56B102D3BED9290CA06E7C7792141DBF303E281D89D28252E5EB05A74DDAD0270245C6C5513374EAE6F24BECFA60CBBD165F29D96134559275E744E13FDA697ECEC38AEA718ACD767E614EA16DB7F8D1FCE5BF0C7DB8429FA0BA5104DEFA882847EF2711B4C8C22569614B227B8FB00419E0CD82FBD6C15EE764B9DBAE670E5A32063283DC285A76969F94CF5E2DC35E295C2EEBB5DC703CDF357B7EB391DDF22750309AAC68228A3D00CC8A4321714961F07A61384ECF6CDB17CD562109410584A3BF9848AA9D9D750112D4C7BEFDEC149887B08218A91CCD715AEDC2ECF3D47E8E6BF703B36F37EB529BB6D87AF65CE459D9C65EE5D6F120F4EDE0E76EBDD218A765EFF44DC7A91BB577814FDF88901134D595024BBAE73AE99E416A77BCD0AF3DDBF4FBFB7AD2FB94DF475DF39D4A52D02DFBCD858C21D98765AECDE202C61329710607B95D43D4A4EF00B3101CBEB425BA3DD821BA4D418390F5CE43081656D6E0F48F56CBE11F49182E00B2079AA24C468BE2DE6DB97781639EDA5D30101C22C8429F13009CF0182216EBEAD89A819454796589D946F0A32E9C84AFDFFC0F504B070890C15C185C040000100F0000504B01021400140008080800ED036F4490C15C185C040000100F0000070000000000000000000000000000000000636F6E74656E74504B0506000000000100010035000000910400000000', 'This is a short description', 0, now(), now(), 2, NULL, 2);
INSERT INTO COLLABORATION_PROPERTIES (id, starred, mindmap_properties) VALUES (3, 1, '{zoom:0.8}');
INSERT INTO COLLABORATION (id, colaborator_id, properties_id, mindmap_id, role_id) VALUES (3, 2, 3, 2, 0);
INSERT INTO LABEL (id, title, creator_id, parent_label_id, color) VALUES (2, 'admin label', 2, NULL, '#0000ff');
INSERT INTO R_LABEL_MINDMAP (label_id, mindmap_id) VALUES (2,2);
INSERT INTO LABEL (id, title, creator_id, parent_label_id, color) VALUES (3, 'mindmap shared', 2, NULL, '#00ff00');
INSERT INTO R_LABEL_MINDMAP (label_id, mindmap_id) VALUES (3,1);
COMMIT;
SHUTDOWN;

View File

@ -37,7 +37,8 @@ CREATE TABLE LABEL (
title VARCHAR(30),
creator_id INTEGER NOT NULL,
parent_label_id INTEGER,
color VARCHAR(7) NOT NULL
color VARCHAR(7) NOT NULL,
iconName VARCHAR(50) NOT NULL
--FOREIGN KEY (creator_id) REFERENCES USER (colaborator_id)
);

View File

@ -10,41 +10,4 @@ INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (2, 'admin@wisemappin
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (2, 'Admin', 'User', 'admin', 1237, CURRENT_DATE(), 1,'D');
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (3, 'homer@wisemapping.org', CURRENT_DATE());
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (3, 'Homer', 'Simpson', 'homer', 1237, CURRENT_DATE(), 1, 'D');
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (4, 'marge@wisemapping.org', CURRENT_DATE());
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (4, 'Marge', 'Bouvier', 'marge', 1237, CURRENT_DATE(), 1, 'D');
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (5, 'bart@wisemapping.org', CURRENT_DATE());
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (5, 'Bart', 'Simpson', 'bart', 1237, CURRENT_DATE(), 1, 'D');
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (6, 'lisa@wisemapping.org', CURRENT_DATE());
INSERT INTO USER (colaborator_id, firstname, lastname, password, activation_code, activation_date, allow_send_email,authentication_type)
VALUES (6, 'Lisa', 'Simpson', 'lisa', 1237, CURRENT_DATE(), 1, 'D');
INSERT INTO MINDMAP (id, title, xml, description, public, creation_date, edition_date, creator_id, tags, last_editor_id)
VALUES (1, 'Welcome Test', 0x504B0304140008080800ED036F4400000000000000000000000007000000636F6E74656E74AD57DD8EDA3814BEEF53B8E9452F360CF985B0C0542C43D5B960355259ED45558D9CC464AC3176E43843A76FB3CFD0479817DB1393F0938442871A09417EFC7DE7F83BDFB1472B9C228E57646CE4194E88819E88CCA8E06343619E08E3FA0D82315222A5118A08571233B827737854916F6A6C4CC54A20F822FC3B96E88381683C366C032D05579FD53383A987C377448FE17068A030990A26E4D8786761F8042586C6A191E07A828C26FCFE81B0D4E8EEDDDED048454695E668F76DB3E3590612322630A35591BA93F02489714C321413B478F9012F8AAC24D760E7E95163E7F856485C638B5E8E506EE90796EF0FF6E8B78410611E11B61F446B20CEC0373B03671B885D053249244920AF7F0B854BFAAE5D83D43372A1C8F5E8ED97E9CD6431F932CB9440107BCEB17E15BDFDFAF57AD4D50F1D32E96A2A27E8B90EE4D9B68366A22B7E33CE70048018DDE184729CA17F49B8E1DB3F9EED963818E58F289720B207A5D23FBBDDF57A7D9508913072158915E03EA7855A6533A9E785625B108AB78DC4AD2299E74CD194410C903CCA8416CEC71C244F1A1A28865E0AA72D843AA46739ED2AD5422A17D5AD6769B9B4601459EA9E8B61BB4D0195C194287E0D65180A160FA9C28C46E70259A6BD13AA53E12C687A90B20D5EEF006F4157241BF6862D419DB97810A5BB53A157817F14720592BBA14B220B7408377BC0854E24891406ED6CF804AD2B794C9DA78B36303BBD5E3317B7600155CA3DB74D225B935842D5DCAF41F32713D2BC50E7D3B18343423B11C434A22F3F38FA27C33C0667606841228663B121E938C76BB4E17F5B83C4716C2FFB47FDEF01CBF8FE913C87027E9C4C66C7F582C26306FB65A2B9F57EC93F8A80773E38174F4411702725775D00BA15473386A6B9CC84D4C6A8DF7A85203BAE0FCE18047B296F53D8B653D2A24B8249CEB248D2904A704B09FF62A84009660DABF24D556BE2FD56B102D3BED9290CA06E7C7792141DBF303E281D89D28252E5EB05A74DDAD0270245C6C5513374EAE6F24BECFA60CBBD165F29D96134559275E744E13FDA697ECEC38AEA718ACD767E614EA16DB7F8D1FCE5BF0C7DB8429FA0BA5104DEFA882847EF2711B4C8C22569614B227B8FB00419E0CD82FBD6C15EE764B9DBAE670E5A32063283DC285A76969F94CF5E2DC35E295C2EEBB5DC703CDF357B7EB391DDF22750309AAC68228A3D00CC8A4321714961F07A61384ECF6CDB17CD562109410584A3BF9848AA9D9D750112D4C7BEFDEC149887B08218A91CCD715AEDC2ECF3D47E8E6BF703B36F37EB529BB6D87AF65CE459D9C65EE5D6F120F4EDE0E76EBDD218A765EFF44DC7A91BB577814FDF88901134D595024BBAE73AE99E416A77BCD0AF3DDBF4FBFB7AD2FB94DF475DF39D4A52D02DFBCD858C21D98765AECDE202C61329710607B95D43D4A4EF00B3101CBEB425BA3DD821BA4D418390F5CE43081656D6E0F48F56CBE11F49182E00B2079AA24C468BE2DE6DB97781639EDA5D30101C22C8429F13009CF0182216EBEAD89A819454796589D946F0A32E9C84AFDFFC0F504B070890C15C185C040000100F0000504B01021400140008080800ED036F4490C15C185C040000100F0000070000000000000000000000000000000000636F6E74656E74504B0506000000000100010035000000910400000000, '', 0, now(), now(), 1, NULL, 1);
INSERT INTO COLLABORATION_PROPERTIES (id, starred, mindmap_properties) VALUES (1, 0, '{zoom:0.8}');
INSERT INTO COLLABORATION (id, colaborator_id, properties_id, mindmap_id, role_id) VALUES (1, 1, 1, 1, 0);
INSERT INTO COLLABORATION_PROPERTIES (id, starred, mindmap_properties) VALUES (2, 1, '{zoom:0.8}');
INSERT INTO COLLABORATION (id, colaborator_id, properties_id, mindmap_id, role_id) VALUES (2, 2, 2, 1, 1);
INSERT INTO LABEL (id, title, creator_id, parent_label_id, color) VALUES (1, 'test label', 1, NULL, '#ff0000');
INSERT INTO R_LABEL_MINDMAP (label_id, mindmap_id) VALUES (1,1);
INSERT INTO MINDMAP (id, title, xml, description, public, creation_date, edition_date, creator_id, tags, last_editor_id)
VALUES (2, 'Welcome Admin', 0x504B0304140008080800ED036F4400000000000000000000000007000000636F6E74656E74AD57DD8EDA3814BEEF53B8E9452F360CF985B0C0542C43D5B960355259ED45558D9CC464AC3176E43843A76FB3CFD0479817DB1393F0938442871A09417EFC7DE7F83BDFB1472B9C228E57646CE4194E88819E88CCA8E06343619E08E3FA0D82315222A5118A08571233B827737854916F6A6C4CC54A20F822FC3B96E88381683C366C032D05579FD53383A987C377448FE17068A030990A26E4D8786761F8042586C6A191E07A828C26FCFE81B0D4E8EEDDDED048454695E668F76DB3E3590612322630A35591BA93F02489714C321413B478F9012F8AAC24D760E7E95163E7F856485C638B5E8E506EE90796EF0FF6E8B78410611E11B61F446B20CEC0373B03671B885D053249244920AF7F0B854BFAAE5D83D43372A1C8F5E8ED97E9CD6431F932CB9440107BCEB17E15BDFDFAF57AD4D50F1D32E96A2A27E8B90EE4D9B68366A22B7E33CE70048018DDE184729CA17F49B8E1DB3F9EED963818E58F289720B207A5D23FBBDDF57A7D9508913072158915E03EA7855A6533A9E785625B108AB78DC4AD2299E74CD194410C903CCA8416CEC71C244F1A1A28865E0AA72D843AA46739ED2AD5422A17D5AD6769B9B4601459EA9E8B61BB4D0195C194287E0D65180A160FA9C28C46E70259A6BD13AA53E12C687A90B20D5EEF006F4157241BF6862D419DB97810A5BB53A157817F14720592BBA14B220B7408377BC0854E24891406ED6CF804AD2B794C9DA78B36303BBD5E3317B7600155CA3DB74D225B935842D5DCAF41F32713D2BC50E7D3B18343423B11C434A22F3F38FA27C33C0667606841228663B121E938C76BB4E17F5B83C4716C2FFB47FDEF01CBF8FE913C87027E9C4C66C7F582C26306FB65A2B9F57EC93F8A80773E38174F4411702725775D00BA15473386A6B9CC84D4C6A8DF7A85203BAE0FCE18047B296F53D8B653D2A24B8249CEB248D2904A704B09FF62A84009660DABF24D556BE2FD56B102D3BED9290CA06E7C7792141DBF303E281D89D28252E5EB05A74DDAD0270245C6C5513374EAE6F24BECFA60CBBD165F29D96134559275E744E13FDA697ECEC38AEA718ACD767E614EA16DB7F8D1FCE5BF0C7DB8429FA0BA5104DEFA882847EF2711B4C8C22569614B227B8FB00419E0CD82FBD6C15EE764B9DBAE670E5A32063283DC285A76969F94CF5E2DC35E295C2EEBB5DC703CDF357B7EB391DDF22750309AAC68228A3D00CC8A4321714961F07A61384ECF6CDB17CD562109410584A3BF9848AA9D9D750112D4C7BEFDEC149887B08218A91CCD715AEDC2ECF3D47E8E6BF703B36F37EB529BB6D87AF65CE459D9C65EE5D6F120F4EDE0E76EBDD218A765EFF44DC7A91BB577814FDF88901134D595024BBAE73AE99E416A77BCD0AF3DDBF4FBFB7AD2FB94DF475DF39D4A52D02DFBCD858C21D98765AECDE202C61329710607B95D43D4A4EF00B3101CBEB425BA3DD821BA4D418390F5CE43081656D6E0F48F56CBE11F49182E00B2079AA24C468BE2DE6DB97781639EDA5D30101C22C8429F13009CF0182216EBEAD89A819454796589D946F0A32E9C84AFDFFC0F504B070890C15C185C040000100F0000504B01021400140008080800ED036F4490C15C185C040000100F0000070000000000000000000000000000000000636F6E74656E74504B0506000000000100010035000000910400000000, 'This is a short description', 0, now(), now(), 2, NULL, 2);
INSERT INTO COLLABORATION_PROPERTIES (id, starred, mindmap_properties) VALUES (3, 1, '{zoom:0.8}');
INSERT INTO COLLABORATION (id, colaborator_id, properties_id, mindmap_id, role_id) VALUES (3, 2, 3, 2, 0);
INSERT INTO LABEL (id, title, creator_id, parent_label_id, color) VALUES (2, 'admin label', 2, NULL, '#0000ff');
INSERT INTO R_LABEL_MINDMAP (label_id, mindmap_id) VALUES (2,2);
INSERT INTO LABEL (id, title, creator_id, parent_label_id, color) VALUES (3, 'mindmap shared', 2, NULL, '#00ff00');
INSERT INTO R_LABEL_MINDMAP (label_id, mindmap_id) VALUES (3,1);
COMMIT;

View File

@ -58,6 +58,7 @@ CREATE TABLE LABEL (
creator_id INTEGER NOT NULL,
parent_label_id INTEGER,
color VARCHAR(7) NOT NULL,
iconName VARCHAR(50) NOT NULL,
FOREIGN KEY (creator_id) REFERENCES USER (colaborator_id),
FOREIGN KEY (parent_label_id) REFERENCES LABEL (id)
ON DELETE CASCADE

View File

@ -31,4 +31,7 @@ CREATE TABLE R_LABEL_MINDMAP (
)
CHARACTER SET utf8;
ALTER TABLE `LABEL`
ADD COLUMN iconName VARCHAR(50) NOT NULL;
UPDATE LABEL SET iconName = 'glyphicon glyphicon-tag';

View File

@ -9,8 +9,11 @@
<groupId>org.wisemapping</groupId>
<artifactId>wisemapping</artifactId>
<relativePath>../pom.xml</relativePath>
<version>3.1-SNAPSHOT</version>
<version>3.0.5-SNAPSHOT</version>
</parent>
<scm>
<developerConnection>scm:git:git@bitbucket.org:wisemapping/wisemapping-open-source.git</developerConnection>
</scm>
<build>
<plugins>
@ -32,6 +35,12 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5</version>
</plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>

View File

@ -53,6 +53,7 @@ cp $BASE_DIR/wisemapping.xml $JETTY_DIR/contexts/
# Distribute scripts
cp -r $BASE_DIR/../config/ $TARGET_DIR/wisemapping-$WISE_VERSION/config
cp ./start.sh ${JETTY_DIR}/
cp -r $BASE_DIR/service $TARGET_DIR/wisemapping-$WISE_VERSION/service
# Store version
echo $1 > $WISE_WEBAPP_DIR/version

View File

@ -0,0 +1,72 @@
#!/bin/bash
### BEGIN INIT INFO
# Provides: wisemapping
# Required-Start: $all
# Required-Stop:
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: wisemapping
# Description: www.wisemapping.com
### END INIT INFO
set -e
set -u
#environmental variables
JAVA_HOME="/usr/lib/jvm/java7"
JDK_HOME=$JAVA_HOME
export PATH=$JAVA_HOME/bin:$PATH
WISE_HOME="/opt/wisemapping"
PID_FILE="$WISE_HOME/.pid"
SELF=$(cd $(dirname $0); pwd -P)/$(basename $0)
preInitChecks() {
MYSQL_STATUS=`pgrep mysql`
if [ -z $MYSQL_STATUS ]; then
service mysql start >/dev/null 2>&1
fi
}
wiseStatus() {
echo `pgrep -f "$WISE_HOME/start.jar"`
}
case "${1:-''}" in
'start')
#preInitChecks
cd $WISE_HOME
echo "Starting Wisemapping..."
java -Xmx256m -Dorg.apache.jasper.compiler.disablejsr199=true -jar $WISE_HOME/start.jar > $WISE_HOME/logs/start.log 2>&1 &
PID=$!
cd - >/dev/null 2>&1
echo "proccess id: $PID"
echo "$PID" > $PID_FILE
;;
'stop')
if [ ! -f $PID_FILE ]; then
PID=$(wiseStatus)
else
PID=`cat $PID_FILE`
rm $PID_FILE >/dev/null 2>&1
fi
kill $PID
echo "Wisemapping stopped"
;;
'restart')
set +e; $SELF stop; set -e
$SELF start
;;
'status')
STATUS=$(wiseStatus)
if [ -n "$STATUS" ]; then
echo "Wisemapping server is running, pid: $STATUS"
else
echo "Wisemapping is stopped"
fi
;;
*)
echo "Usage: $SELF start|stop|restart|status"
exit 1
;;
esac

View File

@ -9,7 +9,7 @@
<groupId>org.wisemapping</groupId>
<artifactId>wisemapping</artifactId>
<relativePath>../pom.xml</relativePath>
<version>3.1-SNAPSHOT</version>
<version>3.0.5-SNAPSHOT</version>
</parent>
<dependencies>

View File

@ -506,6 +506,11 @@ mindplot.Designer = new Class({
if(borderColor){
targetModel.setBorderColor(borderColor)
}
var backgroundColor = sourceModel.getBackgroundColor();
if(backgroundColor){
targetModel.setBackgroundColor(backgroundColor)
}
},
_createChildModel:function (topic, mousePos) {

View File

@ -1,971 +0,0 @@
//
// LESS - Leaner CSS v1.1.3
// http://lesscss.org
//
// Copyright (c) 2009-2011, Alexis Sellier
// Licensed under the Apache 2.0 License.
//
//
// LESS - Leaner CSS v1.1.3
// http://lesscss.org
//
// Copyright (c) 2009-2011, Alexis Sellier
// Licensed under the Apache 2.0 License.
//
(function(a, b) {
function v(a, b) {
var c = "less-error-message:" + p(b),e = ["<ul>",'<li><label>[-1]</label><pre class="ctx">{0}</pre></li>',"<li><label>[0]</label><pre>{current}</pre></li>",'<li><label>[1]</label><pre class="ctx">{2}</pre></li>',"</ul>"].join("\n"),f = document.createElement("div"),g,h;
f.id = c,f.className = "less-error-message",h = "<h3>" + (a.message || "There is an error in your .less file") + "</h3>" + '<p><a href="' + b + '">' + b + "</a> ",a.extract && (h += "on line " + a.line + ", column " + (a.column + 1) + ":</p>" + e.replace(/\[(-?\d)\]/g,
function(b, c) {
return parseInt(a.line) + parseInt(c) || ""
}).replace(/\{(\d)\}/g,
function(b, c) {
return a.extract[parseInt(c)] || ""
}).replace(/\{current\}/, a.extract[1].slice(0, a.column) + '<span class="error">' + a.extract[1].slice(a.column) + "</span>")),f.innerHTML = h,q([".less-error-message ul, .less-error-message li {","list-style-type: none;","margin-right: 15px;","padding: 4px 0;","margin: 0;","}",".less-error-message label {","font-size: 12px;","margin-right: 15px;","padding: 4px 0;","color: #cc7777;","}",".less-error-message pre {","color: #ee4444;","padding: 4px 0;","margin: 0;","display: inline-block;","}",".less-error-message pre.ctx {","color: #dd4444;","}",".less-error-message h3 {","font-size: 20px;","font-weight: bold;","padding: 15px 0 5px 0;","margin: 0;","}",".less-error-message a {","color: #10a","}",".less-error-message .error {","color: red;","font-weight: bold;","padding-bottom: 2px;","border-bottom: 1px dashed red;","}"].join("\n"), {title:"error-message"}),f.style.cssText = ["font-family: Arial, sans-serif","border: 1px solid #e00","background-color: #eee","border-radius: 5px","-webkit-border-radius: 5px","-moz-border-radius: 5px","color: #e00","padding: 15px","margin-bottom: 15px"].join(";"),d.env == "development" && (g = setInterval(function() {
document.body && (document.getElementById(c) ? document.body.replaceChild(f, document.getElementById(c)) : document.body.insertBefore(f, document.body.firstChild),clearInterval(g))
}, 10))
}
function u(a) {
d.env == "development" && typeof console != "undefined" && console.log("less: " + a)
}
function t(a) {
return a && a.parentNode.removeChild(a)
}
function s() {
if (a.XMLHttpRequest)return new XMLHttpRequest;
try {
return new ActiveXObject("MSXML2.XMLHTTP.3.0")
} catch(b) {
u("browser doesn't support AJAX.");
return null
}
}
function r(a, b, c, e) {
function i(b, c, d) {
b.status >= 200 && b.status < 300 ? c(b.responseText, b.getResponseHeader("Last-Modified")) : typeof d == "function" && d(b.status, a)
}
var f = s(),h = g ? !1 : d.async;
typeof f.overrideMimeType == "function" && f.overrideMimeType("text/css"),f.open("GET", a, h),f.setRequestHeader("Accept", b || "text/x-less, text/css; q=0.9, */*; q=0.5"),f.send(null),g ? f.status === 0 ? c(f.responseText) : e(f.status, a) : h ? f.onreadystatechange = function() {
f.readyState == 4 && i(f, c, e)
} : i(f, c, e)
}
function q(a, b, c) {
var d,e = b.href ? b.href.replace(/\?.*$/, "") : "",f = "less:" + (b.title || p(e));
(d = document.getElementById(f)) === null && (d = document.createElement("style"),d.type = "text/css",d.media = b.media || "screen",d.id = f,document.getElementsByTagName("head")[0].appendChild(d));
if (d.styleSheet)try {
d.styleSheet.cssText = a
} catch(g) {
throw new Error("Couldn't reassign styleSheet.cssText.")
} else(function(a) {
d.childNodes.length > 0 ? d.firstChild.nodeValue !== a.nodeValue && d.replaceChild(a, d.firstChild) : d.appendChild(a)
})(document.createTextNode(a));
c && h && (u("saving " + e + " to cache."),h.setItem(e, a),h.setItem(e + ":timestamp", c))
}
function p(a) {
return a.replace(/^[a-z]+:\/\/?[^\/]+/, "").replace(/^\//, "").replace(/\?.*$/, "").replace(/\.[^\.\/]+$/, "").replace(/[^\.\w-]+/g, "-").replace(/\./g, ":")
}
function o(b, c, e, f) {
var g = a.location.href.replace(/[#?].*$/, ""),i = b.href.replace(/\?.*$/, ""),j = h && h.getItem(i),k = h && h.getItem(i + ":timestamp"),l = {css:j,timestamp:k};
/^(https?|file):/.test(i) || (i.charAt(0) == "/" ? i = a.location.protocol + "//" + a.location.host + i : i = g.slice(0, g.lastIndexOf("/") + 1) + i),r(b.href, b.type, function(a, g) {
if (!e && l && g && (new Date(g)).valueOf() === (new Date(l.timestamp)).valueOf())q(l.css, b),c(null, b, {local:!0,remaining:f}); else try {
(new d.Parser({optimization:d.optimization,paths:[i.replace(/[\w\.-]+$/, "")],mime:b.type})).parse(a, function(a, d) {
if (a)return v(a, i);
try {
c(d, b, {local:!1,lastModified:g,remaining:f}),t(document.getElementById("less-error-message:" + p(i)))
} catch(a) {
v(a, i)
}
})
} catch(h) {
v(h, i)
}
}, function(a, b) {
throw new Error("Couldn't load " + b + " (" + a + ")")
})
}
function n(a, b) {
for (var c = 0; c < d.sheets.length; c++)o(d.sheets[c], a, b, d.sheets.length - (c + 1))
}
function m() {
var a = document.getElementsByTagName("style");
for (var b = 0; b < a.length; b++)a[b].type.match(k) && (new d.Parser).parse(a[b].innerHTML || "", function(c, d) {
a[b].type = "text/css",a[b].innerHTML = d.toCSS()
})
}
function c(b) {
return a.less[b.split("/")[1]]
}
Array.isArray || (Array.isArray = function(a) {
return Object.prototype.toString.call(a) === "[object Array]" || a instanceof Array
}),Array.prototype.forEach || (Array.prototype.forEach = function(a, b) {
var c = this.length >>> 0;
for (var d = 0; d < c; d++)d in this && a.call(b, this[d], d, this)
}),Array.prototype.map || (Array.prototype.map = function(a) {
var b = this.length >>> 0,c = Array(b),d = arguments[1];
for (var e = 0; e < b; e++)e in this && (c[e] = a.call(d, this[e], e, this));
return c
}),Array.prototype.filter || (Array.prototype.filter = function(a) {
var b = [],c = arguments[1];
for (var d = 0; d < this.length; d++)a.call(c, this[d]) && b.push(this[d]);
return b
}),Array.prototype.reduce || (Array.prototype.reduce = function(a) {
var b = this.length >>> 0,c = 0;
if (b === 0 && arguments.length === 1)throw new TypeError;
if (arguments.length >= 2)var d = arguments[1]; else for (; ;) {
if (c in this) {
d = this[c++];
break
}
if (++c >= b)throw new TypeError
}
for (; c < b; c++)c in this && (d = a.call(null, d, this[c], c, this));
return d
}),Array.prototype.indexOf || (Array.prototype.indexOf = function(a) {
var b = this.length,c = arguments[1] || 0;
if (!b)return-1;
if (c >= b)return-1;
c < 0 && (c += b);
for (; c < b; c++) {
if (!Object.prototype.hasOwnProperty.call(this, c))continue;
if (a === this[c])return c
}
return-1
}),Object.keys || (Object.keys = function(a) {
var b = [];
for (var c in a)Object.prototype.hasOwnProperty.call(a, c) && b.push(c);
return b
}),String.prototype.trim || (String.prototype.trim = function() {
return String(this).replace(/^\s\s*/, "").replace(/\s\s*$/, "")
});
var d,e;
typeof a == "undefined" ? (d = exports,e = c("less/tree")) : (typeof a.less == "undefined" && (a.less = {}),d = a.less,e = a.less.tree = {}),d.Parser = function(a) {
function t(a) {
return typeof a == "string" ? b.charAt(c) === a : a.test(j[f]) ? !0 : !1
}
function s(a) {
var d,e,g,h,i,m,n,o;
if (a instanceof Function)return a.call(l.parsers);
if (typeof a == "string")d = b.charAt(c) === a ? a : null,g = 1,r(); else {
r();
if (d = a.exec(j[f]))g = d[0].length; else return null
}
if (d) {
o = c += g,m = c + j[f].length - g;
while (c < m) {
h = b.charCodeAt(c);
if (h !== 32 && h !== 10 && h !== 9)break;
c++
}
j[f] = j[f].slice(g + (c - o)),k = c,j[f].length === 0 && f < j.length - 1 && f++;
return typeof d == "string" ? d : d.length === 1 ? d[0] : d
}
}
function r() {
c > k && (j[f] = j[f].slice(c - k),k = c)
}
function q() {
j[f] = g,c = h,k = c
}
function p() {
g = j[f],h = c,k = c
}
var b,c,f,g,h,i,j,k,l,m = this,n = function() {
},o = this.imports = {paths:a && a.paths || [],queue:[],files:{},mime:a && a.mime,push:function(b, c) {
var e = this;
this.queue.push(b),d.Parser.importer(b, this.paths, function(a) {
e.queue.splice(e.queue.indexOf(b), 1),e.files[b] = a,c(a),e.queue.length === 0 && n()
}, a)
}};
this.env = a = a || {},this.optimization = "optimization"in this.env ? this.env.optimization : 1,this.env.filename = this.env.filename || null;
return l = {imports:o,parse:function(d, g) {
var h,l,m,o,p,q,r = [],t,u = null;
c = f = k = i = 0,j = [],b = d.replace(/\r\n/g, "\n"),j = function(c) {
var d = 0,e = /[^"'`\{\}\/\(\)]+/g,f = /\/\*(?:[^*]|\*+[^\/*])*\*+\/|\/\/.*/g,g = 0,h,i = c[0],j,k;
for (var l = 0,m,n; l < b.length; l++) {
e.lastIndex = l,(h = e.exec(b)) && h.index === l && (l += h[0].length,i.push(h[0])),m = b.charAt(l),f.lastIndex = l,!k && !j && m === "/" && (n = b.charAt(l + 1),(n === "/" || n === "*") && (h = f.exec(b)) && h.index === l && (l += h[0].length,i.push(h[0]),m = b.charAt(l)));
if (m === "{" && !k && !j)g++,i.push(m); else if (m === "}" && !k && !j)g--,i.push(m),c[++d] = i = []; else if (m === "(" && !k && !j)i.push(m),j = !0; else if (m === ")" && !k && j)i.push(m),j = !1; else {
if (m === '"' || m === "'" || m === "`")k ? k = k === m ? !1 : k : k = m;
i.push(m)
}
}
if (g > 0)throw{type:"Syntax",message:"Missing closing `}`",filename:a.filename};
return c.map(function(a) {
return a.join("")
})
}([
[]
]),h = new e.Ruleset([], s(this.parsers.primary)),h.root = !0,h.toCSS = function(c) {
var d,f,g;
return function(g, h) {
function n(a) {
return a ? (b.slice(0, a).match(/\n/g) || "").length : null
}
var i = [];
g = g || {},typeof h == "object" && !Array.isArray(h) && (h = Object.keys(h).map(function(a) {
var b = h[a];
b instanceof e.Value || (b instanceof e.Expression || (b = new e.Expression([b])),b = new e.Value([b]));
return new e.Rule("@" + a, b, !1, 0)
}),i = [new e.Ruleset(null, h)]);
try {
var j = c.call(this, {frames:i}).toCSS([], {compress:g.compress || !1})
} catch(k) {
f = b.split("\n"),d = n(k.index);
for (var l = k.index,m = -1; l >= 0 && b.charAt(l) !== "\n"; l--)m++;
throw{type:k.type,message:k.message,filename:a.filename,index:k.index,line:typeof d == "number" ? d + 1 : null,callLine:k.call && n(k.call) + 1,callExtract:f[n(k.call)],stack:k.stack,column:m,extract:[f[d - 1],f[d],f[d + 1]]}
}
return g.compress ? j.replace(/(\s)+/g, "$1") : j
}
}(h.eval);
if (c < b.length - 1) {
c = i,q = b.split("\n"),p = (b.slice(0, c).match(/\n/g) || "").length + 1;
for (var v = c,w = -1; v >= 0 && b.charAt(v) !== "\n"; v--)w++;
u = {name:"ParseError",message:"Syntax Error on line " + p,index:c,filename:a.filename,line:p,column:w,extract:[q[p - 2],q[p - 1],q[p]]}
}
this.imports.queue.length > 0 ? n = function() {
g(u, h)
} : g(u, h)
},parsers:{primary:function() {
var a,b = [];
while ((a = s(this.mixin.definition) || s(this.rule) || s(this.ruleset) || s(this.mixin.call) || s(this.comment) || s(this.directive)) || s(/^[\s\n]+/))a && b.push(a);
return b
},comment:function() {
var a;
if (b.charAt(c) === "/") {
if (b.charAt(c + 1) === "/")return new e.Comment(s(/^\/\/.*/), !0);
if (a = s(/^\/\*(?:[^*]|\*+[^\/*])*\*+\/\n?/))return new e.Comment(a)
}
},entities:{quoted:function() {
var a,d = c,f;
b.charAt(d) === "~" && (d++,f = !0);
if (b.charAt(d) === '"' || b.charAt(d) === "'") {
f && s("~");
if (a = s(/^"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'/))return new e.Quoted(a[0], a[1] || a[2], f)
}
},keyword:function() {
var a;
if (a = s(/^[A-Za-z-]+/))return new e.Keyword(a)
},call:function() {
var a,b,d = c;
if (!!(a = /^([\w-]+|%)\(/.exec(j[f]))) {
a = a[1].toLowerCase();
if (a === "url")return null;
c += a.length;
if (a === "alpha")return s(this.alpha);
s("("),b = s(this.entities.arguments);
if (!s(")"))return;
if (a)return new e.Call(a, b, d)
}
},arguments:function() {
var a = [],b;
while (b = s(this.expression)) {
a.push(b);
if (!s(","))break
}
return a
},literal:function() {
return s(this.entities.dimension) || s(this.entities.color) || s(this.entities.quoted)
},url:function() {
var a;
if (b.charAt(c) === "u" && !!s(/^url\(/)) {
a = s(this.entities.quoted) || s(this.entities.variable) || s(this.entities.dataURI) || s(/^[-\w%@$\/.&=:;#+?~]+/) || "";
if (!s(")"))throw new Error("missing closing ) for url()");
return new e.URL(a.value || a.data || a instanceof e.Variable ? a : new e.Anonymous(a), o.paths)
}
},dataURI:function() {
var a;
if (s(/^data:/)) {
a = {},a.mime = s(/^[^\/]+\/[^,;)]+/) || "",a.charset = s(/^;\s*charset=[^,;)]+/) || "",a.base64 = s(/^;\s*base64/) || "",a.data = s(/^,\s*[^)]+/);
if (a.data)return a
}
},variable:function() {
var a,d = c;
if (b.charAt(c) === "@" && (a = s(/^@@?[\w-]+/)))return new e.Variable(a, d)
},color:function() {
var a;
if (b.charAt(c) === "#" && (a = s(/^#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})/)))return new e.Color(a[1])
},dimension:function() {
var a,d = b.charCodeAt(c);
if (!(d > 57 || d < 45 || d === 47))if (a = s(/^(-?\d*\.?\d+)(px|%|em|pc|ex|in|deg|s|ms|pt|cm|mm|rad|grad|turn)?/))return new e.Dimension(a[1], a[2])
},javascript:function() {
var a,d = c,f;
b.charAt(d) === "~" && (d++,f = !0);
if (b.charAt(d) === "`") {
f && s("~");
if (a = s(/^`([^`]*)`/))return new e.JavaScript(a[1], c, f)
}
}},variable:function() {
var a;
if (b.charAt(c) === "@" && (a = s(/^(@[\w-]+)\s*:/)))return a[1]
},shorthand:function() {
var a,b;
if (!!t(/^[@\w.%-]+\/[@\w.-]+/) && (a = s(this.entity)) && s("/") && (b = s(this.entity)))return new e.Shorthand(a, b)
},mixin:{call:function() {
var a = [],d,f,g,h = c,i = b.charAt(c);
if (i === "." || i === "#") {
while (d = s(/^[#.](?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+/))a.push(new e.Element(f, d)),f = s(">");
s("(") && (g = s(this.entities.arguments)) && s(")");
if (a.length > 0 && (s(";") || t("}")))return new e.mixin.Call(a, g, h)
}
},definition:function() {
var a,d = [],f,g,h,i;
if (!(b.charAt(c) !== "." && b.charAt(c) !== "#" || t(/^[^{]*(;|})/)))if (f = s(/^([#.](?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+)\s*\(/)) {
a = f[1];
while (h = s(this.entities.variable) || s(this.entities.literal) || s(this.entities.keyword)) {
if (h instanceof e.Variable)if (s(":"))if (i = s(this.expression))d.push({name:h.name,value:i}); else throw new Error("Expected value"); else d.push({name:h.name}); else d.push({value:h});
if (!s(","))break
}
if (!s(")"))throw new Error("Expected )");
g = s(this.block);
if (g)return new e.mixin.Definition(a, d, g)
}
}},entity:function() {
return s(this.entities.literal) || s(this.entities.variable) || s(this.entities.url) || s(this.entities.call) || s(this.entities.keyword) || s(this.entities.javascript) || s(this.comment)
},end:function() {
return s(";") || t("}")
},alpha:function() {
var a;
if (!!s(/^\(opacity=/i))if (a = s(/^\d+/) || s(this.entities.variable)) {
if (!s(")"))throw new Error("missing closing ) for alpha()");
return new e.Alpha(a)
}
},element:function() {
var a,b,c;
c = s(this.combinator),a = s(/^(?:[.#]?|:*)(?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+/) || s("*") || s(this.attribute) || s(/^\([^)@]+\)/);
if (a)return new e.Element(c, a)
},combinator:function() {
var a,d = b.charAt(c);
if (d === ">" || d === "&" || d === "+" || d === "~") {
c++;
while (b.charAt(c) === " ")c++;
return new e.Combinator(d)
}
if (d === ":" && b.charAt(c + 1) === ":") {
c += 2;
while (b.charAt(c) === " ")c++;
return new e.Combinator("::")
}
return b.charAt(c - 1) === " " ? new e.Combinator(" ") : new e.Combinator(null)
},selector:function() {
var a,d,f = [],g,h;
while (d = s(this.element)) {
g = b.charAt(c),f.push(d);
if (g === "{" || g === "}" || g === ";" || g === ",")break
}
if (f.length > 0)return new e.Selector(f)
},tag:function() {
return s(/^[a-zA-Z][a-zA-Z-]*[0-9]?/) || s("*")
},attribute:function() {
var a = "",b,c,d;
if (!!s("[")) {
if (b = s(/^[a-zA-Z-]+/) || s(this.entities.quoted))(d = s(/^[|~*$^]?=/)) && (c = s(this.entities.quoted) || s(/^[\w-]+/)) ? a = [b,d,c.toCSS ? c.toCSS() : c].join("") : a = b;
if (!s("]"))return;
if (a)return"[" + a + "]"
}
},block:function() {
var a;
if (s("{") && (a = s(this.primary)) && s("}"))return a
},ruleset:function() {
var a = [],b,d,g;
p();
if (g = /^([.#: \w-]+)[\s\n]*\{/.exec(j[f]))c += g[0].length - 1,a = [new e.Selector([new e.Element(null, g[1])])]; else while (b = s(this.selector)) {
a.push(b),s(this.comment);
if (!s(","))break;
s(this.comment)
}
if (a.length > 0 && (d = s(this.block)))return new e.Ruleset(a, d);
i = c,q()
},rule:function() {
var a,d,g = b.charAt(c),k,l;
p();
if (g !== "." && g !== "#" && g !== "&")if (a = s(this.variable) || s(this.property)) {
a.charAt(0) != "@" && (l = /^([^@+\/'"*`(;{}-]*);/.exec(j[f])) ? (c += l[0].length - 1,d = new e.Anonymous(l[1])) : a === "font" ? d = s(this.font) : d = s(this.value),k = s(this.important);
if (d && s(this.end))return new e.Rule(a, d, k, h);
i = c,q()
}
},"import":function() {
var a;
if (s(/^@import\s+/) && (a = s(this.entities.quoted) || s(this.entities.url)) && s(";"))return new e.Import(a, o)
},directive:function() {
var a,d,f,g;
if (b.charAt(c) === "@") {
if (d = s(this["import"]))return d;
if (a = s(/^@media|@page|@-[-a-z]+/)) {
g = (s(/^[^{]+/) || "").trim();
if (f = s(this.block))return new e.Directive(a + " " + g, f)
} else if (a = s(/^@[-a-z]+/))if (a === "@font-face") {
if (f = s(this.block))return new e.Directive(a, f)
} else if ((d = s(this.entity)) && s(";"))return new e.Directive(a, d)
}
},font:function() {
var a = [],b = [],c,d,f,g;
while (g = s(this.shorthand) || s(this.entity))b.push(g);
a.push(new e.Expression(b));
if (s(","))while (g = s(this.expression)) {
a.push(g);
if (!s(","))break
}
return new e.Value(a)
},value:function() {
var a,b = [],c;
while (a = s(this.expression)) {
b.push(a);
if (!s(","))break
}
if (b.length > 0)return new e.Value(b)
},important:function() {
if (b.charAt(c) === "!")return s(/^! *important/)
},sub:function() {
var a;
if (s("(") && (a = s(this.expression)) && s(")"))return a
},multiplication:function() {
var a,b,c,d;
if (a = s(this.operand)) {
while ((c = s("/") || s("*")) && (b = s(this.operand)))d = new e.Operation(c, [d || a,b]);
return d || a
}
},addition:function() {
var a,d,f,g;
if (a = s(this.multiplication)) {
while ((f = s(/^[-+]\s+/) || b.charAt(c - 1) != " " && (s("+") || s("-"))) && (d = s(this.multiplication)))g = new e.Operation(f, [g || a,d]);
return g || a
}
},operand:function() {
var a,d = b.charAt(c + 1);
b.charAt(c) === "-" && (d === "@" || d === "(") && (a = s("-"));
var f = s(this.sub) || s(this.entities.dimension) || s(this.entities.color) || s(this.entities.variable) || s(this.entities.call);
return a ? new e.Operation("*", [new e.Dimension(-1),f]) : f
},expression:function() {
var a,b,c = [],d;
while (a = s(this.addition) || s(this.entity))c.push(a);
if (c.length > 0)return new e.Expression(c)
},property:function() {
var a;
if (a = s(/^(\*?-?[-a-z_0-9]+)\s*:/))return a[1]
}}}
},typeof a != "undefined" && (d.Parser.importer = function(a, b, c, d) {
a.charAt(0) !== "/" && b.length > 0 && (a = b[0] + a),o({href:a,title:a,type:d.mime}, c, !0)
}),function(a) {
function d(a) {
return Math.min(1, Math.max(0, a))
}
function c(b) {
if (b instanceof a.Dimension)return parseFloat(b.unit == "%" ? b.value / 100 : b.value);
if (typeof b == "number")return b;
throw{error:"RuntimeError",message:"color functions take numbers as parameters"}
}
function b(b) {
return a.functions.hsla(b.h, b.s, b.l, b.a)
}
a.functions = {rgb:function(a, b, c) {
return this.rgba(a, b, c, 1)
},rgba:function(b, d, e, f) {
var g = [b,d,e].map(function(a) {
return c(a)
}),f = c(f);
return new a.Color(g, f)
},hsl:function(a, b, c) {
return this.hsla(a, b, c, 1)
},hsla:function(a, b, d, e) {
function h(a) {
a = a < 0 ? a + 1 : a > 1 ? a - 1 : a;
return a * 6 < 1 ? g + (f - g) * a * 6 : a * 2 < 1 ? f : a * 3 < 2 ? g + (f - g) * (2 / 3 - a) * 6 : g
}
a = c(a) % 360 / 360,b = c(b),d = c(d),e = c(e);
var f = d <= .5 ? d * (b + 1) : d + b - d * b,g = d * 2 - f;
return this.rgba(h(a + 1 / 3) * 255, h(a) * 255, h(a - 1 / 3) * 255, e)
},hue:function(b) {
return new a.Dimension(Math.round(b.toHSL().h))
},saturation:function(b) {
return new a.Dimension(Math.round(b.toHSL().s * 100), "%")
},lightness:function(b) {
return new a.Dimension(Math.round(b.toHSL().l * 100), "%")
},alpha:function(b) {
return new a.Dimension(b.toHSL().a)
},saturate:function(a, c) {
var e = a.toHSL();
e.s += c.value / 100,e.s = d(e.s);
return b(e)
},desaturate:function(a, c) {
var e = a.toHSL();
e.s -= c.value / 100,e.s = d(e.s);
return b(e)
},lighten:function(a, c) {
var e = a.toHSL();
e.l += c.value / 100,e.l = d(e.l);
return b(e)
},darken:function(a, c) {
var e = a.toHSL();
e.l -= c.value / 100,e.l = d(e.l);
return b(e)
},fadein:function(a, c) {
var e = a.toHSL();
e.a += c.value / 100,e.a = d(e.a);
return b(e)
},fadeout:function(a, c) {
var e = a.toHSL();
e.a -= c.value / 100,e.a = d(e.a);
return b(e)
},spin:function(a, c) {
var d = a.toHSL(),e = (d.h + c.value) % 360;
d.h = e < 0 ? 360 + e : e;
return b(d)
},mix:function(b, c, d) {
var e = d.value / 100,f = e * 2 - 1,g = b.toHSL().a - c.toHSL().a,h = ((f * g == -1 ? f : (f + g) / (1 + f * g)) + 1) / 2,i = 1 - h,j = [b.rgb[0] * h + c.rgb[0] * i,b.rgb[1] * h + c.rgb[1] * i,b.rgb[2] * h + c.rgb[2] * i],k = b.alpha * e + c.alpha * (1 - e);
return new a.Color(j, k)
},greyscale:function(b) {
return this.desaturate(b, new a.Dimension(100))
},e:function(b) {
return new a.Anonymous(b instanceof a.JavaScript ? b.evaluated : b)
},escape:function(b) {
return new a.Anonymous(encodeURI(b.value).replace(/=/g, "%3D").replace(/:/g, "%3A").replace(/#/g, "%23").replace(/;/g, "%3B").replace(/\(/g, "%28").replace(/\)/g, "%29"))
},"%":function(b) {
var c = Array.prototype.slice.call(arguments, 1),d = b.value;
for (var e = 0; e < c.length; e++)d = d.replace(/%[sda]/i, function(a) {
var b = a.match(/s/i) ? c[e].value : c[e].toCSS();
return a.match(/[A-Z]$/) ? encodeURIComponent(b) : b
});
d = d.replace(/%%/g, "%");
return new a.Quoted('"' + d + '"', d)
},round:function(b) {
if (b instanceof a.Dimension)return new a.Dimension(Math.round(c(b)), b.unit);
if (typeof b == "number")return Math.round(b);
throw{error:"RuntimeError",message:"math functions take numbers as parameters"}
}}
}(c("less/tree")),function(a) {
a.Alpha = function(a) {
this.value = a
},a.Alpha.prototype = {toCSS:function() {
return"alpha(opacity=" + (this.value.toCSS ? this.value.toCSS() : this.value) + ")"
},eval:function(a) {
this.value.eval && (this.value = this.value.eval(a));
return this
}}
}(c("less/tree")),function(a) {
a.Anonymous = function(a) {
this.value = a.value || a
},a.Anonymous.prototype = {toCSS:function() {
return this.value
},eval:function() {
return this
}}
}(c("less/tree")),function(a) {
a.Call = function(a, b, c) {
this.name = a,this.args = b,this.index = c
},a.Call.prototype = {eval:function(b) {
var c = this.args.map(function(a) {
return a.eval(b)
});
if (!(this.name in a.functions))return new a.Anonymous(this.name + "(" + c.map(
function(a) {
return a.toCSS()
}).join(", ") + ")");
try {
return a.functions[this.name].apply(a.functions, c)
} catch(d) {
throw{message:"error evaluating function `" + this.name + "`",index:this.index}
}
},toCSS:function(a) {
return this.eval(a).toCSS()
}}
}(c("less/tree")),function(a) {
a.Color = function(a, b) {
Array.isArray(a) ? this.rgb = a : a.length == 6 ? this.rgb = a.match(/.{2}/g).map(function(a) {
return parseInt(a, 16)
}) : a.length == 8 ? (this.alpha = parseInt(a.substring(0, 2), 16) / 255,this.rgb = a.substr(2).match(/.{2}/g).map(function(a) {
return parseInt(a, 16)
})) : this.rgb = a.split("").map(function(a) {
return parseInt(a + a, 16)
}),this.alpha = typeof b == "number" ? b : 1
},a.Color.prototype = {eval:function() {
return this
},toCSS:function() {
return this.alpha < 1 ? "rgba(" + this.rgb.map(
function(a) {
return Math.round(a)
}).concat(this.alpha).join(", ") + ")" : "#" + this.rgb.map(
function(a) {
a = Math.round(a),a = (a > 255 ? 255 : a < 0 ? 0 : a).toString(16);
return a.length === 1 ? "0" + a : a
}).join("")
},operate:function(b, c) {
var d = [];
c instanceof a.Color || (c = c.toColor());
for (var e = 0; e < 3; e++)d[e] = a.operate(b, this.rgb[e], c.rgb[e]);
return new a.Color(d, this.alpha + c.alpha)
},toHSL:function() {
var a = this.rgb[0] / 255,b = this.rgb[1] / 255,c = this.rgb[2] / 255,d = this.alpha,e = Math.max(a, b, c),f = Math.min(a, b, c),g,h,i = (e + f) / 2,j = e - f;
if (e === f)g = h = 0; else {
h = i > .5 ? j / (2 - e - f) : j / (e + f);
switch (e) {
case a:
g = (b - c) / j + (b < c ? 6 : 0);
break;
case b:
g = (c - a) / j + 2;
break;
case c:
g = (a - b) / j + 4
}
g /= 6
}
return{h:g * 360,s:h,l:i,a:d}
}}
}(c("less/tree")),function(a) {
a.Comment = function(a, b) {
this.value = a,this.silent = !!b
},a.Comment.prototype = {toCSS:function(a) {
return a.compress ? "" : this.value
},eval:function() {
return this
}}
}(c("less/tree")),function(a) {
a.Dimension = function(a, b) {
this.value = parseFloat(a),this.unit = b || null
},a.Dimension.prototype = {eval:function() {
return this
},toColor:function() {
return new a.Color([this.value,this.value,this.value])
},toCSS:function() {
var a = this.value + this.unit;
return a
},operate:function(b, c) {
return new a.Dimension(a.operate(b, this.value, c.value), this.unit || c.unit)
}}
}(c("less/tree")),function(a) {
a.Directive = function(b, c) {
this.name = b,Array.isArray(c) ? this.ruleset = new a.Ruleset([], c) : this.value = c
},a.Directive.prototype = {toCSS:function(a, b) {
if (this.ruleset) {
this.ruleset.root = !0;
return this.name + (b.compress ? "{" : " {\n ") + this.ruleset.toCSS(a, b).trim().replace(/\n/g, "\n ") + (b.compress ? "}" : "\n}\n")
}
return this.name + " " + this.value.toCSS() + ";\n"
},eval:function(a) {
a.frames.unshift(this),this.ruleset = this.ruleset && this.ruleset.eval(a),a.frames.shift();
return this
},variable:function(b) {
return a.Ruleset.prototype.variable.call(this.ruleset, b)
},find:function() {
return a.Ruleset.prototype.find.apply(this.ruleset, arguments)
},rulesets:function() {
return a.Ruleset.prototype.rulesets.apply(this.ruleset)
}}
}(c("less/tree")),function(a) {
a.Element = function(b, c) {
this.combinator = b instanceof a.Combinator ? b : new a.Combinator(b),this.value = c.trim()
},a.Element.prototype.toCSS = function(a) {
return this.combinator.toCSS(a || {}) + this.value
},a.Combinator = function(a) {
a === " " ? this.value = " " : this.value = a ? a.trim() : ""
},a.Combinator.prototype.toCSS = function(a) {
return{"":""," ":" ","&":"",":":" :","::":"::","+":a.compress ? "+" : " + ","~":a.compress ? "~" : " ~ ",">":a.compress ? ">" : " > "}[this.value]
}
}(c("less/tree")),function(a) {
a.Expression = function(a) {
this.value = a
},a.Expression.prototype = {eval:function(b) {
return this.value.length > 1 ? new a.Expression(this.value.map(function(a) {
return a.eval(b)
})) : this.value.length === 1 ? this.value[0].eval(b) : this
},toCSS:function(a) {
return this.value.map(
function(b) {
return b.toCSS(a)
}).join(" ")
}}
}(c("less/tree")),function(a) {
a.Import = function(b, c) {
var d = this;
this._path = b,b instanceof a.Quoted ? this.path = /\.(le?|c)ss$/.test(b.value) ? b.value : b.value + ".less" : this.path = b.value.value || b.value,this.css = /css$/.test(this.path),this.css || c.push(this.path, function(a) {
if (!a)throw new Error("Error parsing " + d.path);
d.root = a
})
},a.Import.prototype = {toCSS:function() {
return this.css ? "@import " + this._path.toCSS() + ";\n" : ""
},eval:function(b) {
var c;
if (this.css)return this;
c = new a.Ruleset(null, this.root.rules.slice(0));
for (var d = 0; d < c.rules.length; d++)c.rules[d]instanceof a.Import && Array.prototype.splice.apply(c.rules, [d,1].concat(c.rules[d].eval(b)));
return c.rules
}}
}(c("less/tree")),function(a) {
a.JavaScript = function(a, b, c) {
this.escaped = c,this.expression = a,this.index = b
},a.JavaScript.prototype = {eval:function(b) {
var c,d = this,e = {},f = this.expression.replace(/@\{([\w-]+)\}/g, function(c, e) {
return a.jsify((new a.Variable("@" + e, d.index)).eval(b))
});
try {
f = new Function("return (" + f + ")")
} catch(g) {
throw{message:"JavaScript evaluation error: `" + f + "`",index:this.index}
}
for (var h in b.frames[0].variables())e[h.slice(1)] = {value:b.frames[0].variables()[h].value,toJS:function() {
return this.value.eval(b).toCSS()
}};
try {
c = f.call(e)
} catch(g) {
throw{message:"JavaScript evaluation error: '" + g.name + ": " + g.message + "'",index:this.index}
}
return typeof c == "string" ? new a.Quoted('"' + c + '"', c, this.escaped, this.index) : Array.isArray(c) ? new a.Anonymous(c.join(", ")) : new a.Anonymous(c)
}}
}(c("less/tree")),function(a) {
a.Keyword = function(a) {
this.value = a
},a.Keyword.prototype = {eval:function() {
return this
},toCSS:function() {
return this.value
}}
}(c("less/tree")),function(a) {
a.mixin = {},a.mixin.Call = function(b, c, d) {
this.selector = new a.Selector(b),this.arguments = c,this.index = d
},a.mixin.Call.prototype = {eval:function(a) {
var b,c,d = [],e = !1;
for (var f = 0; f < a.frames.length; f++)if ((b = a.frames[f].find(this.selector)).length > 0) {
c = this.arguments && this.arguments.map(function(b) {
return b.eval(a)
});
for (var g = 0; g < b.length; g++)if (b[g].match(c, a))try {
Array.prototype.push.apply(d, b[g].eval(a, this.arguments).rules),e = !0
} catch(h) {
throw{message:h.message,index:h.index,stack:h.stack,call:this.index}
}
if (e)return d;
throw{message:"No matching definition was found for `" + this.selector.toCSS().trim() + "(" + this.arguments.map(
function(a) {
return a.toCSS()
}).join(", ") + ")`",index:this.index}
}
throw{message:this.selector.toCSS().trim() + " is undefined",index:this.index}
}},a.mixin.Definition = function(b, c, d) {
this.name = b,this.selectors = [new a.Selector([new a.Element(null, b)])],this.params = c,this.arity = c.length,this.rules = d,this._lookups = {},this.required = c.reduce(function(a, b) {
return!b.name || b.name && !b.value ? a + 1 : a
}, 0),this.parent = a.Ruleset.prototype,this.frames = []
},a.mixin.Definition.prototype = {toCSS:function() {
return""
},variable:function(a) {
return this.parent.variable.call(this, a)
},variables:function() {
return this.parent.variables.call(this)
},find:function() {
return this.parent.find.apply(this, arguments)
},rulesets:function() {
return this.parent.rulesets.apply(this)
},eval:function(b, c) {
var d = new a.Ruleset(null, []),e,f = [];
for (var g = 0,h; g < this.params.length; g++)if (this.params[g].name)if (h = c && c[g] || this.params[g].value)d.rules.unshift(new a.Rule(this.params[g].name, h.eval(b))); else throw{message:"wrong number of arguments for " + this.name + " (" + c.length + " for " + this.arity + ")"};
for (var g = 0; g < Math.max(this.params.length, c && c.length); g++)f.push(c[g] || this.params[g].value);
d.rules.unshift(new a.Rule("@arguments", (new a.Expression(f)).eval(b)));
return(new a.Ruleset(null, this.rules.slice(0))).eval({frames:[this,d].concat(this.frames, b.frames)})
},match:function(a, b) {
var c = a && a.length || 0,d;
if (c < this.required)return!1;
if (this.required > 0 && c > this.params.length)return!1;
d = Math.min(c, this.arity);
for (var e = 0; e < d; e++)if (!this.params[e].name && a[e].eval(b).toCSS() != this.params[e].value.eval(b).toCSS())return!1;
return!0
}}
}(c("less/tree")),function(a) {
a.Operation = function(a, b) {
this.op = a.trim(),this.operands = b
},a.Operation.prototype.eval = function(b) {
var c = this.operands[0].eval(b),d = this.operands[1].eval(b),e;
if (c instanceof a.Dimension && d instanceof a.Color)if (this.op === "*" || this.op === "+")e = d,d = c,c = e; else throw{name:"OperationError",message:"Can't substract or divide a color from a number"};
return c.operate(this.op, d)
},a.operate = function(a, b, c) {
switch (a) {
case"+":
return b + c;
case"-":
return b - c;
case"*":
return b * c;
case"/":
return b / c
}
}
}(c("less/tree")),function(a) {
a.Quoted = function(a, b, c, d) {
this.escaped = c,this.value = b || "",this.quote = a.charAt(0),this.index = d
},a.Quoted.prototype = {toCSS:function() {
return this.escaped ? this.value : this.quote + this.value + this.quote
},eval:function(b) {
var c = this,d = this.value.replace(/`([^`]+)`/g,
function(d, e) {
return(new a.JavaScript(e, c.index, !0)).eval(b).value
}).replace(/@\{([\w-]+)\}/g, function(d, e) {
var f = (new a.Variable("@" + e, c.index)).eval(b);
return f.value || f.toCSS()
});
return new a.Quoted(this.quote + d + this.quote, d, this.escaped, this.index)
}}
}(c("less/tree")),function(a) {
a.Rule = function(b, c, d, e) {
this.name = b,this.value = c instanceof a.Value ? c : new a.Value([c]),this.important = d ? " " + d.trim() : "",this.index = e,b.charAt(0) === "@" ? this.variable = !0 : this.variable = !1
},a.Rule.prototype.toCSS = function(a) {
return this.variable ? "" : this.name + (a.compress ? ":" : ": ") + this.value.toCSS(a) + this.important + ";"
},a.Rule.prototype.eval = function(b) {
return new a.Rule(this.name, this.value.eval(b), this.important, this.index)
},a.Shorthand = function(a, b) {
this.a = a,this.b = b
},a.Shorthand.prototype = {toCSS:function(a) {
return this.a.toCSS(a) + "/" + this.b.toCSS(a)
},eval:function() {
return this
}}
}(c("less/tree")),function(a) {
a.Ruleset = function(a, b) {
this.selectors = a,this.rules = b,this._lookups = {}
},a.Ruleset.prototype = {eval:function(b) {
var c = new a.Ruleset(this.selectors, this.rules.slice(0));
c.root = this.root,b.frames.unshift(c);
if (c.root)for (var d = 0; d < c.rules.length; d++)c.rules[d]instanceof a.Import && Array.prototype.splice.apply(c.rules, [d,1].concat(c.rules[d].eval(b)));
for (var d = 0; d < c.rules.length; d++)c.rules[d]instanceof a.mixin.Definition && (c.rules[d].frames = b.frames.slice(0));
for (var d = 0; d < c.rules.length; d++)c.rules[d]instanceof a.mixin.Call && Array.prototype.splice.apply(c.rules, [d,1].concat(c.rules[d].eval(b)));
for (var d = 0,e; d < c.rules.length; d++)e = c.rules[d],e instanceof a.mixin.Definition || (c.rules[d] = e.eval ? e.eval(b) : e);
b.frames.shift();
return c
},match:function(a) {
return!a || a.length === 0
},variables:function() {
return this._variables ? this._variables : this._variables = this.rules.reduce(function(b, c) {
c instanceof a.Rule && c.variable === !0 && (b[c.name] = c);
return b
}, {})
},variable:function(a) {
return this.variables()[a]
},rulesets:function() {
return this._rulesets ? this._rulesets : this._rulesets = this.rules.filter(function(b) {
return b instanceof a.Ruleset || b instanceof a.mixin.Definition
})
},find:function(b, c) {
c = c || this;
var d = [],e,f,g = b.toCSS();
if (g in this._lookups)return this._lookups[g];
this.rulesets().forEach(function(e) {
if (e !== c)for (var g = 0; g < e.selectors.length; g++)if (f = b.match(e.selectors[g])) {
b.elements.length > 1 ? Array.prototype.push.apply(d, e.find(new a.Selector(b.elements.slice(1)), c)) : d.push(e);
break
}
});
return this._lookups[g] = d
},toCSS:function(b, c) {
var d = [],e = [],f = [],g = [],h,i;
if (!this.root)if (b.length === 0)g = this.selectors.map(function(a) {
return[a]
}); else for (var j = 0; j < this.selectors.length; j++)for (var k = 0; k < b.length; k++)g.push(b[k].concat([this.selectors[j]]));
for (var l = 0; l < this.rules.length; l++)i = this.rules[l],i.rules || i instanceof a.Directive ? f.push(i.toCSS(g, c)) : i instanceof a.Comment ? i.silent || (this.root ? f.push(i.toCSS(c)) : e.push(i.toCSS(c))) : i.toCSS && !i.variable ? e.push(i.toCSS(c)) : i.value && !i.variable && e.push(i.value.toString());
f = f.join(""),this.root ? d.push(e.join(c.compress ? "" : "\n")) : e.length > 0 && (h = g.map(
function(a) {
return a.map(
function(a) {
return a.toCSS(c)
}).join("").trim()
}).join(c.compress ? "," : g.length > 3 ? ",\n" : ", "),d.push(h, (c.compress ? "{" : " {\n ") + e.join(c.compress ? "" : "\n ") + (c.compress ? "}" : "\n}\n"))),d.push(f);
return d.join("") + (c.compress ? "\n" : "")
}}
}(c("less/tree")),function(a) {
a.Selector = function(a) {
this.elements = a,this.elements[0].combinator.value === "" && (this.elements[0].combinator.value = " ")
},a.Selector.prototype.match = function(a) {
return this.elements[0].value === a.elements[0].value ? !0 : !1
},a.Selector.prototype.toCSS = function(a) {
if (this._css)return this._css;
return this._css = this.elements.map(
function(b) {
return typeof b == "string" ? " " + b.trim() : b.toCSS(a)
}).join("")
}
}(c("less/tree")),function(b) {
b.URL = function(b, c) {
b.data ? this.attrs = b : (!/^(?:https?:\/|file:\/|data:\/)?\//.test(b.value) && c.length > 0 && typeof a != "undefined" && (b.value = c[0] + (b.value.charAt(0) === "/" ? b.value.slice(1) : b.value)),this.value = b,this.paths = c)
},b.URL.prototype = {toCSS:function() {
return"url(" + (this.attrs ? "data:" + this.attrs.mime + this.attrs.charset + this.attrs.base64 + this.attrs.data : this.value.toCSS()) + ")"
},eval:function(a) {
return this.attrs ? this : new b.URL(this.value.eval(a), this.paths)
}}
}(c("less/tree")),function(a) {
a.Value = function(a) {
this.value = a,this.is = "value"
},a.Value.prototype = {eval:function(b) {
return this.value.length === 1 ? this.value[0].eval(b) : new a.Value(this.value.map(function(a) {
return a.eval(b)
}))
},toCSS:function(a) {
return this.value.map(
function(b) {
return b.toCSS(a)
}).join(a.compress ? "," : ", ")
}}
}(c("less/tree")),function(a) {
a.Variable = function(a, b) {
this.name = a,this
.index = b
},a.Variable.prototype = {eval:function(b) {
var c,d,e = this.name;
e.indexOf("@@") == 0 && (e = "@" + (new a.Variable(e.slice(1))).eval(b).value);
if (c = a.find(b.frames, function(a) {
if (d = a.variable(e))return d.value.eval(b)
}))return c;
throw{message:"variable " + e + " is undefined",index:this.index}
}}
}(c("less/tree")),c("less/tree").find = function(a, b) {
for (var c = 0,d; c < a.length; c++)if (d = b.call(a, a[c]))return d;
return null
},c("less/tree").jsify = function(a) {
return Array.isArray(a.value) && a.value.length > 1 ? "[" + a.value.map(
function(a) {
return a.toCSS(!1)
}).join(", ") + "]" : a.toCSS(!1)
};
var g = location.protocol === "file:" || location.protocol === "chrome:" || location.protocol === "chrome-extension:" || location.protocol === "resource:";
d.env = d.env || (location.hostname == "127.0.0.1" || location.hostname == "0.0.0.0" || location.hostname == "localhost" || location.port.length > 0 || g ? "development" : "production"),d.async = !1,d.poll = d.poll || (g ? 1e3 : 1500),d.watch = function() {
return this.watchMode = !0
},d.unwatch = function() {
return this.watchMode = !1
},d.env === "development" ? (d.optimization = 0,/!watch/.test(location.hash) && d.watch(),d.watchTimer = setInterval(function() {
d.watchMode && n(function(a, b, c) {
a && q(a.toCSS(), b, c.lastModified)
})
}, d.poll)) : d.optimization = 3;
var h;
try {
h = typeof a.localStorage == "undefined" ? null : a.localStorage
} catch(i) {
h = null
}
var j = document.getElementsByTagName("link"),k = /^text\/(x-)?less$/;
d.sheets = [];
for (var l = 0; l < j.length; l++)(j[l].rel === "stylesheet/less" || j[l].rel.match(/stylesheet/) && j[l].type.match(k)) && d.sheets.push(j[l]);
d.refresh = function(a) {
var b,c;
b = c = new Date,n(function(a, d, e) {
e.local ? u("loading " + d.href + " from cache.") : (u("parsed " + d.href + " successfully."),q(a.toCSS(), d, e.lastModified)),u("css for " + d.href + " generated in " + (new Date - c) + "ms"),e.remaining === 0 && u("css generated in " + (new Date - b) + "ms"),c = new Date
}, a),m()
},d.refreshStyles = m,d.refresh(d.env === "development")
})(window)

File diff suppressed because one or more lines are too long

View File

@ -67,7 +67,7 @@ mindplot.widget.LinkIconTooltip = new Class({
});
var img = new Element('img', {
src:'http://immediatenet.com/t/m?Size=1024x768&URL=' + linkIcon.getModel().getUrl(),
src:'https://api.thumbalizr.com/?url=' + linkIcon.getModel().getUrl() + '&width=250',
img:linkIcon.getModel().getUrl(),
alt:linkIcon.getModel().getUrl()
}

View File

@ -4,7 +4,7 @@
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<properties>
<com.wisemapping.version>3.1-SNAPSHOT</com.wisemapping.version>
<com.wisemapping.version>3.0.5-SNAPSHOT</com.wisemapping.version>
<superpom.dir>${project.basedir}/wise-webapps</superpom.dir>
</properties>
@ -12,7 +12,7 @@
<groupId>org.wisemapping</groupId>
<artifactId>wisemapping</artifactId>
<name>WiseMapping Project</name>
<version>3.1-SNAPSHOT</version>
<version>3.0.5-SNAPSHOT</version>
<packaging>pom</packaging>
<licenses>

View File

@ -9,7 +9,7 @@
<groupId>org.wisemapping</groupId>
<artifactId>wisemapping</artifactId>
<relativePath>../pom.xml</relativePath>
<version>3.1-SNAPSHOT</version>
<version>3.0.5-SNAPSHOT</version>
</parent>
<build>

View File

@ -9,7 +9,7 @@
<groupId>org.wisemapping</groupId>
<artifactId>wisemapping</artifactId>
<relativePath>../pom.xml</relativePath>
<version>3.1-SNAPSHOT</version>
<version>3.0.5-SNAPSHOT</version>
</parent>
<dependencies>
@ -27,5 +27,62 @@
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>8.1.14.v20131031</version>
<configuration>
<connectors>
<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
<port>8080</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
</connectors>
<webApp>${project.build.directory}/wise-editor-${com.wisemapping.version}.war</webApp>
</configuration>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
<configuration>
<warSourceExcludes>js/mindplot-min.js</warSourceExcludes>
<overlays>
<overlay>
<groupId>org.wisemapping</groupId>
<artifactId>core-js</artifactId>
<type>jar</type>
<targetPath>js</targetPath>
<includes>
<include>*.js</include>
</includes>
</overlay>
<overlay>
<groupId>org.wisemapping</groupId>
<artifactId>mindplot</artifactId>
<type>jar</type>
<targetPath>css</targetPath>
<includes>
<include>**/*.css</include>
<include>**/*.html</include>
</includes>
</overlay>
<overlay>
<groupId>org.wisemapping</groupId>
<artifactId>mindplot</artifactId>
<type>jar</type>
<targetPath>js</targetPath>
<includes>
<include>*.js</include>
</includes>
</overlay>
</overlays>
</configuration>
</plugin>
</plugins>
</build>
</project>

View File

@ -1 +1 @@
../../../../../mindplot/src/main/javascript/libraries/less/less-1.1.3.min.js
../../../../../mindplot/src/main/javascript/libraries/less/less-1.6.2.min.js

View File

@ -9,7 +9,7 @@
<groupId>org.wisemapping</groupId>
<artifactId>wisemapping</artifactId>
<relativePath>../pom.xml</relativePath>
<version>3.1-SNAPSHOT</version>
<version>3.0.5-SNAPSHOT</version>
</parent>
<repositories>
@ -547,9 +547,9 @@
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.1.1.v20140108</version>
<version>8.1.14.v20131031</version>
<configuration>
<stopKey>foo</stopKey>
<stopPort>9999</stopPort>
@ -559,6 +559,14 @@
<overrideDescriptor>${project.basedir}/webdefault.xml</overrideDescriptor>
</webAppConfig>
<systemProperties>
<systemProperty>
<name>org.mortbay.util.FileResource.checkAliases</name>
<value>false</value>
</systemProperty>
<systemProperty>
<name>org.mortbay.util.FileResource.checkAliases</name>
<value>false</value>
</systemProperty>
<systemProperty>
<name>database.base.url</name>
<value>${project.build.directory}</value>
@ -598,9 +606,9 @@
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.jetty</groupId>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-runner</artifactId>
<version>9.1.3.v20140225</version>
<version>7.4.5.v20110725</version>
<destFileName>jetty-runner.jar</destFileName>
</artifactItem>
</artifactItems>

View File

@ -21,6 +21,7 @@ package com.wisemapping.exporter;
public class ExportProperties {
private ExportFormat format;
private String baseImgPath;
private String version;
public ExportFormat getFormat() {
return format;
@ -40,6 +41,14 @@ public class ExportProperties {
return result;
}
public String getVersion() {
return version;
}
public void setVersion(String version) {
this.version = version;
}
static public class GenericProperties extends ExportProperties {
private GenericProperties(ExportFormat format) {
super(format);

View File

@ -18,6 +18,7 @@
package com.wisemapping.exporter;
import com.wisemapping.importer.VersionNumber;
import org.apache.batik.parser.AWTTransformProducer;
import org.apache.batik.parser.ParseException;
import org.apache.batik.parser.TransformListParser;
@ -142,6 +143,7 @@ public class ExporterFactory {
}
case FREEMIND: {
final FreemindExporter exporter = new FreemindExporter();
exporter.setVersion(new VersionNumber(properties.getVersion()));
exporter.export(xml.getBytes(UTF_8_CHARSET_NAME), output);
break;
}

View File

@ -19,6 +19,8 @@
package com.wisemapping.exporter;
import com.wisemapping.importer.VersionNumber;
import com.wisemapping.importer.freemind.FreemindConstant;
import com.wisemapping.importer.freemind.FreemindIconConverter;
import com.wisemapping.jaxb.wisemap.Note;
import com.wisemapping.model.Mindmap;
@ -42,6 +44,7 @@ import java.io.OutputStream;
import java.io.ByteArrayInputStream;
import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -49,12 +52,10 @@ import java.util.Map;
public class FreemindExporter
implements Exporter {
private static final String FREE_MIND_VERSION = "0.9.0";
private static final String POSITION_LEFT = "left";
private static final String POSITION_RIGHT = "right";
private com.wisemapping.jaxb.freemind.ObjectFactory objectFactory;
private static final String EMPTY_FONT_STYLE = ";;;;;";
private Map<String, Node> nodesMap = null;
private VersionNumber version = FreemindConstant.SUPPORTED_FREEMIND_VERSION;
public void export(Mindmap map, OutputStream outputStream) throws ExportException {
export(map.getUnzipXml(), outputStream);
@ -71,7 +72,7 @@ public class FreemindExporter
mindmapMap = (com.wisemapping.jaxb.wisemap.Map) JAXBUtils.getMapObject(stream, "com.wisemapping.jaxb.wisemap");
final com.wisemapping.jaxb.freemind.Map freemindMap = objectFactory.createMap();
freemindMap.setVersion(FREE_MIND_VERSION);
freemindMap.setVersion(this.getVersionNumber());
final List<TopicType> topics = mindmapMap.getTopic();
@ -98,8 +99,9 @@ public class FreemindExporter
final List<RelationshipType> relationships = mindmapMap.getRelationship();
for (RelationshipType relationship : relationships) {
Node srcNode = nodesMap.get(relationship.getSrcTopicId());
Node dstNode = nodesMap.get(relationship.getDestTopicId());
// FIXME:invert srcNode and dstNode to correct a bug in the wise mind map representation
Node srcNode = nodesMap.get(relationship.getDestTopicId());
Node dstNode = nodesMap.get(relationship.getSrcTopicId());
// Workaround for nodes without relationship associated ...
@ -136,6 +138,7 @@ public class FreemindExporter
private void addNodeFromTopic(@NotNull final TopicType mainTopic, @NotNull final Node destNode) throws IOException, SAXException, ParserConfigurationException {
final List<TopicType> currentTopic = mainTopic.getTopic();
Collections.sort(currentTopic, new VerticalPositionComparator());
for (TopicType topicType : currentTopic) {
final Node newNode = objectFactory.createNode();
nodesMap.put(topicType.getId(), newNode);
@ -149,9 +152,9 @@ public class FreemindExporter
if (position != null) {
String xPos = position.split(",")[0];
int x = Integer.valueOf(xPos);
newNode.setPOSITION((x < 0 ? POSITION_LEFT : POSITION_RIGHT));
newNode.setPOSITION((x < 0 ? FreemindConstant.POSITION_LEFT : FreemindConstant.POSITION_RIGHT));
} else {
newNode.setPOSITION(POSITION_LEFT);
newNode.setPOSITION(FreemindConstant.POSITION_LEFT);
}
}
}
@ -174,17 +177,23 @@ public class FreemindExporter
}
}
freemindNode.setBACKGROUNDCOLOR(mindmapTopic.getBgColor());
String wiseShape = mindmapTopic.getShape();
if (wiseShape != null && !ShapeStyle.LINE.equals(ShapeStyle.fromValue(wiseShape))) {
freemindNode.setBACKGROUNDCOLOR(mindmapTopic.getBgColor());
}
final String shape = mindmapTopic.getShape();
if (shape != null && !shape.isEmpty()) {
if (isRoot && !ShapeStyle.ROUNDED_RECTANGLE.getStyle().endsWith(shape) || !isRoot && !ShapeStyle.LINE.getStyle().endsWith(shape)) {
String style = shape;
if (ShapeStyle.ROUNDED_RECTANGLE.getStyle().equals(shape)) {
if (ShapeStyle.ROUNDED_RECTANGLE.getStyle().equals(shape) || ShapeStyle.ELLIPSE.getStyle().equals(shape)) {
style = "bubble";
}
freemindNode.setSTYLE(style);
}
} else if (!isRoot) {
String style = "fork";
freemindNode.setSTYLE(style);
}
addIconNode(freemindNode, mindmapTopic);
@ -274,15 +283,15 @@ public class FreemindExporter
final Font font = objectFactory.createFont();
final String[] part = fontStyle.split(";", 6);
int countParts = part.length;
boolean updated = false;
boolean fontNodeNeeded = false;
if (!fontStyle.endsWith(EMPTY_FONT_STYLE)) {
if (!fontStyle.endsWith(FreemindConstant.EMPTY_FONT_STYLE)) {
int idx = 0;
// Font name
if (idx < countParts && part[idx].length() != 0) {
font.setNAME(part[idx]);
updated = true;
fontNodeNeeded = true;
}
idx++;
@ -290,11 +299,11 @@ public class FreemindExporter
if (idx < countParts && part[idx].length() != 0) {
final String size = part[idx];
if (size != null && !size.isEmpty()) {
int freeSize = Integer.parseInt(size);
Integer fsize = wiseToFreeFontSize.get(freeSize);
if(fsize!=null){
font.setSIZE(BigInteger.valueOf(fsize));
updated = true;
int wiseSize = Integer.parseInt(size);
Integer freeSize = wiseToFreeFontSize.get(wiseSize);
if(freeSize!=null){
font.setSIZE(BigInteger.valueOf(freeSize));
fontNodeNeeded = true;
}
}
}
@ -303,23 +312,26 @@ public class FreemindExporter
// Font Color
if (idx < countParts && part[idx].length() != 0) {
freemindNode.setCOLOR(part[idx]);
updated = true;
}
idx++;
// Font Styles
if (idx < countParts && part[idx].length() != 0) {
font.setBOLD(Boolean.TRUE.toString());
updated = true;
fontNodeNeeded = true;
}
idx++;
if (idx < countParts && part[idx].length() != 0) {
font.setITALIC(Boolean.TRUE.toString());
updated = true;
fontNodeNeeded = true;
}
if (updated) {
if (fontNodeNeeded) {
// font size should be set if freemind node has font properties note
if (font.getSIZE() == null) {
font.setSIZE(BigInteger.valueOf(wiseToFreeFontSize.get(8)));
}
freemindNode.getArrowlinkOrCloudOrEdge().add(font);
}
}
@ -342,4 +354,15 @@ public class FreemindExporter
}
public VersionNumber getVersion() {
return version;
}
public void setVersion(VersionNumber version) {
this.version = version;
}
public String getVersionNumber() {
return this.getVersion().getVersion();
}
}

View File

@ -0,0 +1,26 @@
package com.wisemapping.exporter;
import com.wisemapping.jaxb.wisemap.TopicType;
import java.util.Comparator;
public class VerticalPositionComparator implements Comparator<TopicType> {
@Override
public int compare(TopicType o1, TopicType o2) {
final String myPosition = o1.getPosition();
final String otherPosition = o2.getPosition();
int result;
if (otherPosition == null) {
result = -1;
} else if (myPosition == null) {
result = 1;
} else {
int myPositionY = Integer.parseInt(myPosition.split(",")[1]);
int otherPositionY = Integer.parseInt(otherPosition.split(",")[1]);
result = myPositionY - otherPositionY;
}
return result;
}
}

View File

@ -47,6 +47,7 @@ public class SupportedUserAgent implements Serializable {
boolean result = browser == Browser.FIREFOX && majorVersion >= 10;
result = result || browser == Browser.FIREFOX2 && majorVersion >= 17;
result = result || browser == Browser.FIREFOX3 && majorVersion >= 29;
result = result || browser == Browser.IE8 || browser == Browser.IE9 || browser == Browser.IE11 ;
result = result || browser == Browser.IE && majorVersion >= 8;
result = result || browser == Browser.OPERA10 && majorVersion >= 11;

View File

@ -0,0 +1,34 @@
package com.wisemapping.importer.freemind;
import com.wisemapping.importer.VersionNumber;
import java.nio.charset.Charset;
public interface FreemindConstant {
public static final String LAST_SUPPORTED_FREEMIND_VERSION = "1.0.1";
public static final VersionNumber SUPPORTED_FREEMIND_VERSION = new VersionNumber(LAST_SUPPORTED_FREEMIND_VERSION);
public static final String CODE_VERSION = "tango";
public static final int SECOND_LEVEL_TOPIC_HEIGHT = 25;
public static final int ROOT_LEVEL_TOPIC_HEIGHT = SECOND_LEVEL_TOPIC_HEIGHT;
public static final int CENTRAL_TO_TOPIC_DISTANCE = 200;
public static final int TOPIC_TO_TOPIC_DISTANCE = 90;
public static final int FONT_SIZE_HUGE = 15;
public static final int FONT_SIZE_LARGE = 10;
public static final int FONT_SIZE_NORMAL = 8;
public static final int FONT_SIZE_SMALL = 6;
public static final String NODE_TYPE = "NODE";
public static final String BOLD = "bold";
public static final String ITALIC = "italic";
public static final String EMPTY_FONT_STYLE = ";;;;;";
public static final String EMPTY_NOTE = "";
public static final String POSITION_LEFT = "left";
public static final String POSITION_RIGHT = "right";
public final static Charset UTF_8_CHARSET = Charset.forName("UTF-8");
}

View File

@ -33,9 +33,7 @@ import com.wisemapping.jaxb.wisemap.Link;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jsoup.Jsoup;
import org.jsoup.nodes.*;
import org.jsoup.nodes.Document;
import org.w3c.dom.*;
import org.w3c.dom.Element;
import javax.xml.bind.JAXBException;
@ -46,37 +44,17 @@ import java.io.InputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.StringWriter;
import java.nio.charset.Charset;
import java.util.*;
import java.math.BigInteger;
public class FreemindImporter
implements Importer {
public static final String CODE_VERSION = "tango";
public static final int SECOND_LEVEL_TOPIC_HEIGHT = 25;
public static final int ROOT_LEVEL_TOPIC_HEIGHT = SECOND_LEVEL_TOPIC_HEIGHT;
public static final int CENTRAL_TO_TOPIC_DISTANCE = 200;
public static final int TOPIC_TO_TOPIC_DISTANCE = 90;
public static final String NODE_TYPE = "NODE";
private com.wisemapping.jaxb.wisemap.ObjectFactory mindmapObjectFactory;
private static final String POSITION_LEFT = "left";
private static final String BOLD = "bold";
private static final String ITALIC = "italic";
private static final String EMPTY_NOTE = "";
private java.util.Map<String, TopicType> nodesMap = null;
private List<RelationshipType> relationships = null;
private static final String EMPTY_FONT_STYLE = ";;;;;";
private final static Charset UTF_8_CHARSET = Charset.forName("UTF-8");
private final static int ORDER_SEPARATION_FACTOR = 2;
private static final VersionNumber SUPPORTED_FREEMIND_VERSION = new VersionNumber("0.9.0");
private int currentId;
private static final int FONT_SIZE_HUGE = 15;
private static final int FONT_SIZE_LARGE = 10;
public static final int FONT_SIZE_NORMAL = 8;
private static final int FONT_SIZE_SMALL = 6;
public static void main(String argv[]) {
@ -120,13 +98,8 @@ public class FreemindImporter
final String version = freemindMap.getVersion();
if (version != null) {
// Is freemind mindmap ?
if (version.charAt(0) != '0') {
throw new ImporterException("Mindmap is not a FreeMind document. Document type info " + version);
}
final VersionNumber mapVersion = new VersionNumber(version);
if (SUPPORTED_FREEMIND_VERSION.isGreaterThan(mapVersion)) {
if (mapVersion.isGreaterThan(FreemindConstant.SUPPORTED_FREEMIND_VERSION)) {
throw new ImporterException("FreeMind version " + mapVersion.getVersion() + " is not supported.");
}
}
@ -135,7 +108,7 @@ public class FreemindImporter
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
final com.wisemapping.jaxb.wisemap.Map mindmapMap = mindmapObjectFactory.createMap();
mindmapMap.setVersion(CODE_VERSION);
mindmapMap.setVersion(FreemindConstant.CODE_VERSION);
currentId = 0;
final Node freeNode = freemindMap.getNode();
@ -156,7 +129,7 @@ public class FreemindImporter
addRelationships(mindmapMap);
JAXBUtils.saveMap(mindmapMap, baos);
wiseXml = new String(baos.toByteArray(), UTF_8_CHARSET);
wiseXml = new String(baos.toByteArray(), FreemindConstant.UTF_8_CHARSET);
result.setXmlStr(wiseXml);
result.setTitle(mapName);
result.setDescription(description);
@ -235,6 +208,8 @@ public class FreemindImporter
TopicType currentWiseTopic = wiseParent;
int order = 0;
int firstLevelRightOrder = 0;
int firstLevelLeftOrder = 1;
for (Object element : freeChilden) {
if (element instanceof Node) {
@ -252,13 +227,19 @@ public class FreemindImporter
if (depth != 1) {
norder = order++;
} else {
norder = calcFirstLevelOrder(freeChilden, freeChild);
if (freeChild.getPOSITION() != null && freeChild.getPOSITION().equals(FreemindConstant.POSITION_LEFT)) {
norder = firstLevelLeftOrder;
firstLevelLeftOrder = firstLevelLeftOrder + 2;
} else {
norder = firstLevelRightOrder;
firstLevelRightOrder = firstLevelRightOrder + 2;
}
}
wiseChild.setOrder(norder);
// Convert node position
int childrenCount = freeChilden.size();
final String position = convertPosition(wiseParent, freeChild, depth, norder, childrenCount);
int childrenCountSameSide = getChildrenCountSameSide(freeChilden, freeChild);
final String position = convertPosition(wiseParent, freeChild, depth, norder, childrenCountSameSide);
wiseChild.setPosition(position);
// Convert the rest of the node properties ...
@ -297,7 +278,7 @@ public class FreemindImporter
String textNote = hook.getText();
if (textNote == null) // It is not a note is a BlinkingNodeHook or AutomaticLayout Hook
{
textNote = EMPTY_NOTE;
textNote = FreemindConstant.EMPTY_NOTE;
mindmapNote.setValue(textNote);
currentWiseTopic.setNote(mindmapNote);
}
@ -305,13 +286,13 @@ public class FreemindImporter
final Richcontent content = (Richcontent) element;
final String type = content.getTYPE();
if (type.equals(NODE_TYPE)) {
if (type.equals(FreemindConstant.NODE_TYPE)) {
String text = html2text(content);
currentWiseTopic.setText(text);
} else {
String text = html2text(content);
final com.wisemapping.jaxb.wisemap.Note mindmapNote = new com.wisemapping.jaxb.wisemap.Note();
text = text != null ? text : EMPTY_NOTE;
text = text != null ? text : FreemindConstant.EMPTY_NOTE;
mindmapNote.setValue(text);
currentWiseTopic.setNote(mindmapNote);
@ -320,8 +301,9 @@ public class FreemindImporter
final Arrowlink arrow = (Arrowlink) element;
RelationshipType relt = mindmapObjectFactory.createRelationshipType();
String destId = arrow.getDESTINATION();
relt.setSrcTopicId(freeParent.getID());
relt.setDestTopicId(destId);
// FIXME: invert srcTopic and dstTopic to correct a bug in the wise mind map representation
relt.setSrcTopicId(destId);
relt.setDestTopicId(freeParent.getID());
final String endinclination = arrow.getENDINCLINATION();
if (endinclination != null) {
String[] inclination = endinclination.split(";");
@ -348,50 +330,27 @@ public class FreemindImporter
}
}
/**
* Sort the freemind node following this pattern:
* <p/>
* 0 -> 3
* 1 -> 1
* 2 -> 0
* 3 -> 2
* 4 -> 4
*/
private int calcFirstLevelOrder(@NotNull List<Object> freeChilden, @Nullable Node freeChild) {
final List<Node> nodes = new ArrayList<Node>();
int result;
private int getChildrenCountSameSide(@NotNull List<Object> freeChildren, Node freeChild) {
int result = 0;
String childSide = freeChild.getPOSITION();
if (childSide == null) {
childSide = FreemindConstant.POSITION_RIGHT;
}
// Collect all the nodes of the same side ...
for (Object child : freeChilden) {
// Count all the nodes of the same side ...
for (Object child : freeChildren) {
if (child instanceof Node) {
Node node = (Node) child;
final String side = node.getPOSITION();
if (side == freeChild.getPOSITION() || freeChild.getPOSITION().equals(side)) {
nodes.add(node);
String side = node.getPOSITION();
if (side == null) {
side = FreemindConstant.POSITION_RIGHT;
}
if (childSide.equals(side)) {
result++;
}
}
}
// What is the index of the current node ?
int nodeIndex = 0;
for (Node node : nodes) {
if (node == freeChild) {
break;
}
nodeIndex++;
}
int size = nodes.size();
int center = (size - 1) / 2;
result = nodeIndex - center;
if (result < 0) {
result = (result * ORDER_SEPARATION_FACTOR * -2) - 1;
} else {
result = result * ORDER_SEPARATION_FACTOR * 2;
}
return result;
}
@ -410,11 +369,11 @@ public class FreemindImporter
// Problem on setting X position:
// Text Size is not taken into account ...
int x = CENTRAL_TO_TOPIC_DISTANCE + ((depth - 1) * TOPIC_TO_TOPIC_DISTANCE);
int x = FreemindConstant.CENTRAL_TO_TOPIC_DISTANCE + ((depth - 1) * FreemindConstant.TOPIC_TO_TOPIC_DISTANCE);
if (depth == 1) {
final String side = freeChild.getPOSITION();
x = x * (side != null && POSITION_LEFT.equals(side) ? -1 : 1);
x = x * (side != null && FreemindConstant.POSITION_LEFT.equals(side) ? -1 : 1);
} else {
final Coord coord = Coord.parse(wiseParent.getPosition());
x = x * (coord.isOnLeftSide() ? -1 : 1);
@ -425,23 +384,21 @@ public class FreemindImporter
int y;
if (depth == 1) {
// Follow the following algorithm ...
// Order: 3 = -100 1
// Order: 1 = -50 2
// Order: 0 = 0 3
// Order: 2 = 50 4
// Order: 4 = 100 5
// pair order numbers represent nodes at the right
// odd order numbers represent nodes at the left
if (order % 2 == 0) {
y = ROOT_LEVEL_TOPIC_HEIGHT * order;
int multiplier = ((order + 1) - childrenCount) * 2;
y = multiplier * FreemindConstant.ROOT_LEVEL_TOPIC_HEIGHT;
} else {
y = -ROOT_LEVEL_TOPIC_HEIGHT * (order + 1);
int multiplier = (order - childrenCount) * 2;
y = multiplier * FreemindConstant.ROOT_LEVEL_TOPIC_HEIGHT;
}
} else {
// Problem: What happen if the node is more tall than what is defined here.
Coord coord = Coord.parse(wiseParent.getPosition());
int parentY = coord.y;
y = parentY - ((childrenCount / 2) * SECOND_LEVEL_TOPIC_HEIGHT - (order * SECOND_LEVEL_TOPIC_HEIGHT));
y = parentY - ((childrenCount / 2) * FreemindConstant.SECOND_LEVEL_TOPIC_HEIGHT - (order * FreemindConstant.SECOND_LEVEL_TOPIC_HEIGHT));
}
@ -573,14 +530,14 @@ public class FreemindImporter
// 10 Large
// 15 Huge
if (font != null) {
final int fontSize = ((font.getSIZE() == null || font.getSIZE().intValue() < 8) ? BigInteger.valueOf(FONT_SIZE_NORMAL) : font.getSIZE()).intValue();
int wiseFontSize = FONT_SIZE_SMALL;
final int fontSize = ((font.getSIZE() == null || font.getSIZE().intValue() < 8) ? BigInteger.valueOf(FreemindConstant.FONT_SIZE_NORMAL) : font.getSIZE()).intValue();
int wiseFontSize = FreemindConstant.FONT_SIZE_SMALL;
if (fontSize >= 24) {
wiseFontSize = FONT_SIZE_HUGE;
wiseFontSize = FreemindConstant.FONT_SIZE_HUGE;
} else if (fontSize >= 16) {
wiseFontSize = FONT_SIZE_LARGE;
wiseFontSize = FreemindConstant.FONT_SIZE_LARGE;
} else if (fontSize >= 12) {
wiseFontSize = FONT_SIZE_NORMAL;
wiseFontSize = FreemindConstant.FONT_SIZE_NORMAL;
}
fontStyle.append(wiseFontSize);
@ -597,19 +554,19 @@ public class FreemindImporter
// Bold ...
if (font != null) {
boolean hasBold = Boolean.parseBoolean(font.getBOLD());
fontStyle.append(hasBold ? BOLD : "");
fontStyle.append(hasBold ? FreemindConstant.BOLD : "");
}
fontStyle.append(";");
// Italic ...
if (font != null) {
boolean hasItalic = Boolean.parseBoolean(font.getITALIC());
fontStyle.append(hasItalic ? ITALIC : "");
fontStyle.append(hasItalic ? FreemindConstant.ITALIC : "");
}
fontStyle.append(";");
final String result = fontStyle.toString();
return result.equals(EMPTY_FONT_STYLE) ? null : result;
return result.equals(FreemindConstant.EMPTY_FONT_STYLE) ? null : result;
}
private

View File

@ -12,6 +12,7 @@ public class Label {
@NotNull private User creator;
@Nullable private Label parent;
@NotNull private String color;
@NotNull private String iconName;
public void setParent(@Nullable Label parent) {
this.parent = parent;
@ -57,6 +58,15 @@ public class Label {
this.color = color;
}
@NotNull
public String getIconName() {
return iconName;
}
public void setIconName(@NotNull String iconName) {
this.iconName = iconName;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
@ -76,4 +86,5 @@ public class Label {
result = 31 * result + (parent != null ? parent.hashCode() : 0);
return result;
}
}

View File

@ -23,7 +23,8 @@ public enum ShapeStyle
LINE("line"),
ROUNDED_RECTANGLE("rounded rectagle"),
RECTANGLE("rectagle"),
ELLIPSE("elipse");
ELLIPSE("elipse"),
IMAGE("image");
private String style;
@ -36,4 +37,13 @@ public enum ShapeStyle
{
return style;
}
public static ShapeStyle fromValue(String value) {
for (ShapeStyle shapeStyle : ShapeStyle.values()) {
if (shapeStyle.getStyle().equals(value)) {
return shapeStyle;
}
}
throw new IllegalArgumentException("Shape value \"" + value + "\" doesn't match with a value shape style.");
}
}

View File

@ -114,13 +114,14 @@ public class MindmapController extends BaseController {
return new ModelAndView("transformViewWise", values);
}
@RequestMapping(method = RequestMethod.GET, value = "/maps/{id}", produces = {"application/freemind"}, params = {"download=mm"})
@RequestMapping(method = RequestMethod.GET, value = "/maps/{id}", produces = {"application/freemind"}, params = {"download=mm","version"})
@ResponseBody
public ModelAndView retrieveDocumentAsFreemind(@PathVariable int id) throws IOException, MapCouldNotFoundException {
public ModelAndView retrieveDocumentAsFreemind(@PathVariable int id, @RequestParam(value = "version") String version) throws IOException, MapCouldNotFoundException {
final Mindmap mindMap = findMindmapById(id);
final Map<String, Object> values = new HashMap<String, Object>();
values.put("content", mindMap.getXmlStr());
values.put("filename", mindMap.getTitle());
values.put("version", version);
return new ModelAndView("transformViewFreemind", values);
}

View File

@ -65,10 +65,18 @@ public class RestLabel {
label.setColor(color);
}
public void setIconName(@NotNull final String iconName) {
label.setIconName(iconName);
}
@Nullable public String getColor() {
return label.getColor();
}
@Nullable public String getIconName() {
return label.getIconName();
}
@JsonIgnore
public Label getDelegated() {
return label;

View File

@ -56,6 +56,7 @@ public class TransformView extends AbstractView {
final String content = (String) viewMap.get("content");
final String filename = (String) viewMap.get("filename");
final String version = (String) viewMap.get("version");
// Build format properties ...
final ExportProperties properties = ExportProperties.create(exportFormat);
@ -63,6 +64,9 @@ public class TransformView extends AbstractView {
final ExportProperties.ImageProperties imageProperties = (ExportProperties.ImageProperties) properties;
imageProperties.setSize(ExportProperties.ImageProperties.Size.LARGE);
}
if (version != null) {
properties.setVersion(version);
}
// Set format content type...
final String contentType = exportFormat.getContentType();

View File

@ -37,6 +37,7 @@ public class LabelValidator implements Validator {
private void validateLabel(@NotNull final Label label, @NotNull final Errors errors) {
ValidationUtils.rejectIfEmptyOrWhitespace(errors, "title", Messages.FIELD_REQUIRED);
ValidationUtils.rejectIfEmptyOrWhitespace(errors, "color", Messages.FIELD_REQUIRED);
ValidationUtils.rejectIfEmptyOrWhitespace(errors, "iconName", Messages.FIELD_REQUIRED);
final String title = label.getTitle();
ValidatorUtils.rejectIfExceeded(
errors,

View File

@ -11,6 +11,7 @@
</id>
<property name="title"/>
<property name="color"/>
<property name="iconName"/>
<many-to-one name="parent" column="parent_label_id" not-null="false"/>
<many-to-one name="creator" column="creator_id" unique="true" not-null="false" lazy="proxy"/>
</class>

View File

@ -35,7 +35,8 @@ EXPORT=Exportar
SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG)
PDF_EXPORT_FORMAT=Portable Document Format (PDF)
IMG_EXPORT_FORMAT=Imatge(PNG/JPEG)
FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0)
FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0)
FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1)
DELETE=Esborrar
LOGIN_ERROR=El nom d'usuari o la contrasenya no són correctes
USER_INACTIVE=Perdo, el seu compre encara no ha estar activar. Rebrà un correu amb les dades d'activació.
@ -162,7 +163,7 @@ ADD_MESSAGE=Afegir un missatge
WHO_CAN_ACCESS=Qui pot accedir
IS_OWNER=És propietari
OPTIONAL_CUSTOM_MESSAGE=Opcional\: Incloure un missatge personalitzat
IMPORT_MINDMAP_INFO=És possible importar mapes en format FreeMind 0.9 i WiseMapping. Seleccioni el fitxer a importar.
IMPORT_MINDMAP_INFO=És possible importar mapes en format FreeMind 1.0.1 i WiseMapping. Seleccioni el fitxer a importar.
VIEW=veure
YOU=Vostè
INFO_UPDATE_SUCCESS=La seva informació s'ha actualitzat correctament.

View File

@ -38,7 +38,8 @@ EXPORT=Exportieren
SVG_EXPORT_FORMAT=Skalierbare Vektor Graphik (SVG)
PDF_EXPORT_FORMAT=Portables Dokumenten Format (PDF)
IMG_EXPORT_FORMAT=Bilddatei (PNG/JPEG)
FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0)
FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0)
FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1)
WISEMAPPING_EXPORT_FORMAT = WiseMapping
LAST_UPDATE=Zuletzt geändert
LAST_UPDATE_BY=Zuletzt geändert von
@ -99,7 +100,7 @@ UNEXPECTED_ERROR=Outch!!. Ein unerwarteter Fehler ist aufgetreten.
UNEXPECTED_ERROR_DETAILS=Es tut uns Leid! Es ist ein Fehler aufgetreten der es uns nicht ermöglicht Ihre Anfrage zu bearbeiten. Bitte versuchen Sie es noch einmal oder gehen Sie zur Anfangsseite.
NO_ENOUGH_PERMISSIONS=Outch!!. Diese map ist nicht mehr verfügbar.
NO_ENOUGH_PERMISSIONS_DETAILS=Sie haben nicht die erforderlichen Rechte, um sich diese map anzusehen. Diese map ist entweder privat oder wurde gelöscht.
IMPORT_MINDMAP_INFO=Sie können FreeMind 0.9 und WiseMapping maps in Ihre List von maps importieren. Wählen Sie die Datei zum Import.
IMPORT_MINDMAP_INFO=Sie können FreeMind 1.0.1 und WiseMapping maps in Ihre List von maps importieren. Wählen Sie die Datei zum Import.
PRINT=Drucken
IMPORT_MAP_ERROR=FreeMind Datei konnte nicht importiert werden. {0}
MAP_TITLE_ALREADY_EXISTS=Sie haben schon eine map mit identischem Namen.

View File

@ -40,7 +40,8 @@ EXPORT=Export
SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG)
PDF_EXPORT_FORMAT=Portable Document Format (PDF)
IMG_EXPORT_FORMAT=Image File (PNG/JPEG)
FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0)
FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0)
FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1)
WISEMAPPING_EXPORT_FORMAT = WiseMapping
LAST_UPDATE=Last Update
LAST_UPDATE_BY=Last Update By
@ -103,7 +104,7 @@ UNEXPECTED_ERROR_DETAILS=We're sorry, an error has occurred and we can't process
UNEXPECTED_ERROR_SERVER_ERROR=We're sorry, an error has occurred and we can't process your request. Refresh the page and try again. If the problem persist, click below on "Raise An Issue" to open a ticket.
NO_ENOUGH_PERMISSIONS=Outch!!. This map is not available anymore.
NO_ENOUGH_PERMISSIONS_DETAILS=You do not have enough right access to see this map. This map has been changed to private or deleted.
IMPORT_MINDMAP_INFO=You can import FreeMind 0.9 and WiseMapping maps to your list of maps. Select the file you want to import.
IMPORT_MINDMAP_INFO=You can import FreeMind 1.0.1 and WiseMapping maps to your list of maps. Select the file you want to import.
PRINT=Print
IMPORT_MAP_ERROR=FreeMind file could not be imported. {0}
MAP_TITLE_ALREADY_EXISTS=You have already a map with the same name
@ -145,6 +146,7 @@ NEW=New
MIND_FILE=File
PARENT_LABEL=Nest label under
COLOR=Color
ICON=Icon
CHOOSE_LABEL=Choose a label
SELECT_LABEL=Please select a label
NO_SEARCH_RESULT=No mindmap available for the selected filter criteria
@ -281,6 +283,132 @@ OPEN_OFFICE_EXPORT_FORMAT_DETAILS=Get your map as OpenOffice Write Document
MINDJET_EXPORT_FORMAT=(BETA) MindJet 8.x
MINDJET_EXPORT_FORMAT_DETAILS=Export your maps in MindJet 8.x format
MINDMAP_IS_LOCKED=Mindmap is locked for edition.
# icons..
ASTERISK=Asterisk
PLUS=Plus
EURO=Euro
MINUS=Minus
CLOUD=Cloud
ENVELOPE=Envelope
PENCIL=Pencil
CLASS=Glass
MUSIC=Music
HEART=Heart
STAR=Star
STAR-EMPTY=Empty Star
USER=User
FILM=Film
OK=Ok
REMOVE=Remove
SIGNAL=Signal
COG=Cog
TRASH=Trash
FILE=File
TIME=Time
DOWNLOAD-ALT=Download
DOWNLOAD=Download
UPLOAD=Upload
INBOX=Inbox
REPEAT=Repeat
REFRESH=Refresh
LIST-ALT=List
LOCK=Lock
FLAG=Flag
HEADPHONES=Headphones
GRCODE=GR Code
BARCODE=Barcode
TAG=Tag
TAGS=Tags
BOOK=Book
BOOKMARK=Bookmark
PRING=Print
CAMERA=Camera
LIST=List
FACETIME-VIDEO=Facetime Video
PICTURE=Picture
MAP-MARKER=Map Maker
ADJUST=Adjust
TINT=Tint
EDIT=Edit
CHECK=Check
CHEVRON-LEFT=Chevron Left
CHEVRON-RIGHT=Chevron Right
PLUS-SIGN=Plus Sign
MINUS-SIGN=Minus Sign
REMOVE-SIGN=Remove Sign
OK-SIGN=Ok Sign
QUESTION-SIGN=Question Sign
INFO-SIGN=Info Sign
SCREENSHOT=Screenshot
REMOVE-CIRCLE=Remove Circle
OK-CIRCLE=Ok Circle
BAN-CIRCLE=Ban Circle
ARROW-LEFT=Arrow Left
ARROW-RIGHT=Arrow Right
ARROW-UP=Arrow Up
ARROW-DOWN=Arrow Down
SHARE-ALT=Share
EXCLAMATION-SIGN=Exclamation
GIFT=Gift
LEAF=Leaf
FIRE=Fire
EYE-OPEN=Open eye
EYE-CLOSE=Closed eye
WARNING-SIGN=Warning
PLANE=Plane
CALENDAR=Calendar
RANDOM=Random
COMMENT=Comment
MAGNET=Magnet
CHEVRON-UP=Chevrop Up
CHEVRON-DOWN=Chevron Down
SHOPPING-CART=Shopping
FOLDER-CLOSE=Closed Folder
FOLDER-OPEN=Open Folder
HDD=HDD
BULLHORN=Bullhorn
BELL=Bell
CERTIFICATE=Certificate
THUMBS-UP=Thumbs up
THUMBS-DOWN=Thumbs down
HAND-RIGHT=Hand right
HAND-LEFT=Hand left
HAND-UP=Hang up
HAND-DOWN=Hang down
CIRCLE-ARROW-RIGHT=Circle right
CIRCLE-ARROW-LEFT=Circle left
CIRCLE-ARROW-UP=Circle up
CIRCLE-ARROW-DOWN=Circle down
GLOBE=Globe
WRENCH=Wrench
TASKS=Tasks
FILTER=Filter
BRIEFCASE=Briefcase
PAPERCLIP=Paperclip
HEART-EMPTY=Empty Heart
LINK=Link
PHONE=Phone
PUSHPIN=Pushpin
USD=USD
GBP=GBP
UNCHECKED=Unchecked
FLASH=Flash
RECORD=Record
SAVED=Saved
SEND=Send
FLOPPY-DISK=Floppy Disk
TRANSFER
CUTLERY=Cutlery
HEADER=Header
COMPRESSED=Compressed
EARPHONE=Earphone
PHONE-ALT=Phone
TOWER=Tower
STATS=Stats
COPYRIGTH-MARK=Copyright
REGISTRATION-MARK=Registration Mark
CLOUD-DOWNLOAD=Cloud Download
CLOUD-UPLOAD=Cloud Updload

View File

@ -35,7 +35,8 @@ EXPORT=Exportar
SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG)
PDF_EXPORT_FORMAT=Portable Document Format (PDF)
IMG_EXPORT_FORMAT=Imagen (PNG/JPEG)
FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0)
FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0)
FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1)
DELETE=Borrar
LOGIN_ERROR=El nombre de usuario o la contraseña introducidos no son correctos.
USER_INACTIVE=Disculpe, su cuenta aun no ha sido activada. Usted recibirá una notificación por email tan pronto la activemos.
@ -66,7 +67,7 @@ ACCOUNT_DETAIL=Desea cambiar sus preferencias? Este es el lugar.
SVG_EXPORT_FORMAT_DETAILS=Scalable Vector Graphics (SVG) es un XML markup language para describir gráficos vectoriale de dos dimensiones. Este formato le permitira imprimir sus mapas sin perdida de calidad o resolución.
PDF_EXPORT_FORMAT_DETAILS=Obtenga su mapa como un documento (PDF) para compartirlo y usarlo en sus presentaciones.
IMG_EXPORT_FORMAT_DETAILS=Obtenga una representación gráfica de su mapa incluyendo todo los colores y formas para reusarlo en documentos o para ser archivado
FREEMIND_EXPORT_FORMAT_DETAILS = FreeMind un aplicación de escritorio gratuita de diseno de mapas mentales
FREEMIND_EXPORT_FORMAT_DETAILS = FreeMind una aplicación de escritorio gratuita de diseño de mapas mentales
TERMSOFUSE=Términos de uso
PRIVACYPOLICY= Politica de privacidad
EXPORT_DETAILS=Exporte el mapa en el formato que desee y comience a utilizarlo en sus presentaciones
@ -164,7 +165,7 @@ ADD_MESSAGE=Agregar un mensaje
WHO_CAN_ACCESS=Quienes pueden acceder
IS_OWNER=Es dueño
OPTIONAL_CUSTOM_MESSAGE=Opcional\: Incluir un mensaje personalizado
IMPORT_MINDMAP_INFO=Es posible importar mapas en formato FreeMind 0.9 y WiseMapping. Seleccione el archivo a importar.
IMPORT_MINDMAP_INFO=Es posible importar mapas en formato FreeMind 1.0.1 y WiseMapping. Seleccione el archivo a importar.
VIEW=ver
YOU=Vos
INFO_UPDATE_SUCCESS=Your info has been changed successfully

View File

@ -43,7 +43,8 @@ EXPORT=Exporter
SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG)
PDF_EXPORT_FORMAT=Portable Document Format (PDF)
IMG_EXPORT_FORMAT=Fichier Graphique (PNG/JPEG)
FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0)
FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0)
FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1)
WISEMAPPING_EXPORT_FORMAT = WiseMapping
LAST_UPDATE=Date dernière modification
LAST_UPDATE_BY=Dernière modification par
@ -104,7 +105,7 @@ UNEXPECTED_ERROR=Aïe!!. Une erreur inattendue est survenue.
UNEXPECTED_ERROR_DETAILS=Désolé, une erreur s'est produite et nous ne pouvons pas exécuter votre demande. Essayez à nouveau, ou retournez à la page d'accueil.
NO_ENOUGH_PERMISSIONS=Aïe!!. Cette carte n'est plus accessible.
NO_ENOUGH_PERMISSIONS_DETAILS=Vous n'avez pas les droits d'accès suffisants pour voir cette carte. Cette carte est devenue privée, ou a été détruite.
IMPORT_MINDMAP_INFO=Vous pouvez importer des cartes FreeMind 0.9 et WiseMapping dans votre liste de cartes. Choisissez le fichier à importer.
IMPORT_MINDMAP_INFO=Vous pouvez importer des cartes FreeMind 1.0.1 et WiseMapping dans votre liste de cartes. Choisissez le fichier à importer.
PRINT=Imprimer
IMPORT_MAP_ERROR=Le fichier FreeMind n'a pas pu être importé. {0}
MAP_TITLE_ALREADY_EXISTS=Vous avez déjà une carte portant le même nom.

View File

@ -38,7 +38,8 @@ EXPORT=Esporta
SVG_EXPORT_FORMAT=Scalable Vector Graphics (SVG)
PDF_EXPORT_FORMAT=Portable Document Format (PDF)
IMG_EXPORT_FORMAT=File Immagine (PNG/JPEG)
FREEMIND_EXPORT_FORMAT = Freemind (versione 0.9.0)
FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0)
FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1)
WISEMAPPING_EXPORT_FORMAT = WiseMapping
LAST_UPDATE=Ultimo Aggiornamento
LAST_UPDATE_BY=Ultimo aggiornamento da
@ -99,7 +100,7 @@ UNEXPECTED_ERROR=Oops!! Si è verificato un errore inaspettato.
UNEXPECTED_ERROR_DETAILS=Siamo spiacenti, si è verificato un errore e non possiamo procedere nella tua richiesta. Prego, provare più tardi o torna alla home page.
NO_ENOUGH_PERMISSIONS=Oops!!. Questa mappa non è più disponibile.
NO_ENOUGH_PERMISSIONS_DETAILS=Non hai sufficienti diritti per visualizzare questa mappa. Il suo stato è cambiato in Privato oppure è stata eliminata.
IMPORT_MINDMAP_INFO=Puoi importare mappe da FreeMind 0.9 e da WiseMapping sulla tua lista di mappe. Seleziona il file da importare.
IMPORT_MINDMAP_INFO=Puoi importare mappe da FreeMind 1.0.1 e da WiseMapping sulla tua lista di mappe. Seleziona il file da importare.
PRINT=Stampa
IMPORT_MAP_ERROR=Il file FreeMind non può essere importato. {0}
MAP_TITLE_ALREADY_EXISTS=Esiste già una mappa con lo stesso nome

View File

@ -36,7 +36,8 @@ EXPORT=Exportar
SVG_EXPORT_FORMAT=Gráfico Vetorial Escalável (SVG)
PDF_EXPORT_FORMAT=Formato de Documento Portável (PDF)
IMG_EXPORT_FORMAT=Arquivo de Imagem (PNG/JPEG)
FREEMIND_EXPORT_FORMAT = Exportar para o Freemind (version 0.9.0)
FREEMIND_EXPORT_FORMAT_09 = Exportar para o Freemind (version 0.9.0)
FREEMIND_EXPORT_FORMAT = Exportar para o Freemind (version 1.0.1)
WISEMAPPING_EXPORT_FORMAT = WiseMapping
LAST_UPDATE=Última Atualização
LAST_UPDATE_BY=Última Atualização
@ -97,7 +98,7 @@ UNEXPECTED_ERROR=Opa!!. Ocorreu um erro inesperado.
UNEXPECTED_ERROR_DETAILS=Lamentamos, ocorreu um erro e não podemos processar a sua solicitação. Por favor, tente novamente ou vá para a página Inicial.
NO_ENOUGH_PERMISSIONS=Opa!!. Este mapa não está mais disponível.
NO_ENOUGH_PERMISSIONS_DETAILS=Você não tem privilégios suficientes para ver este mapa. Este mapa foi alterado para privado ou deletado.
IMPORT_MINDMAP_INFO=Você pode importar mapas do FreeMind 0.9 e do WiseMapping para sua lista de mapas. Selecione o arquivo que você quer importar.
IMPORT_MINDMAP_INFO=Você pode importar mapas do FreeMind 1.0.1 e do WiseMapping para sua lista de mapas. Selecione o arquivo que você quer importar.
PRINT=Imprimir
IMPORT_MAP_ERROR=O arquivo FreeMind não pode ser importado. {0}
MAP_TITLE_ALREADY_EXISTS=Você já tem um mapa com o mesmo nome

View File

@ -99,7 +99,7 @@ UNEXPECTED_ERROR=晕!!不可预知的错误。
UNEXPECTED_ERROR_DETAILS=抱歉,突遭错误,我们无法处理你的请求。 请重试或者访问首页。
NO_ENOUGH_PERMISSIONS=晕!!此图不可访问。
NO_ENOUGH_PERMISSIONS_DETAILS=你没有权限访问这张图。此图已修改访问权限或者已删除。
IMPORT_MINDMAP_INFO=你可以导入 FreeMind 0.9 和 WiseMapping 格式的思维导图。选择你想要导入的文件。
IMPORT_MINDMAP_INFO=你可以导入 FreeMind 1.0.1 和 WiseMapping 格式的思维导图。选择你想要导入的文件。
PRINT=打印
IMPORT_MAP_ERROR=FreeMind 文件不能导入。
MAP_TITLE_ALREADY_EXISTS=已有同名称图

View File

@ -38,7 +38,8 @@ EXPORT=導出
SVG_EXPORT_FORMAT=可縮放向量圖形(SVG)
PDF_EXPORT_FORMAT=便攜檔格式(PDF)
IMG_EXPORT_FORMAT=圖像檔(PNG/JPEG)
FREEMIND_EXPORT_FORMAT = Freemind (version 0.9.0)
FREEMIND_EXPORT_FORMAT_09 = Freemind (version 0.9.0)
FREEMIND_EXPORT_FORMAT = Freemind (version 1.0.1)
WISEMAPPING_EXPORT_FORMAT = WiseMapping
LAST_UPDATE=最近更新
LAST_UPDATE_BY=最近更新者
@ -99,7 +100,7 @@ UNEXPECTED_ERROR=暈!!不可預知的錯誤。
UNEXPECTED_ERROR_DETAILS=抱歉,突遭錯誤,我們無法處理你的請求。 請重試或者訪問首頁。
NO_ENOUGH_PERMISSIONS=暈!!此圖不可訪問。
NO_ENOUGH_PERMISSIONS_DETAILS=你沒有許可權訪問這張圖。此圖已修改訪問許可權或者已刪除。
IMPORT_MINDMAP_INFO=你可以導入 FreeMind 0.9 和 WiseMapping 格式的思維導圖。選擇你想要導入的檔。
IMPORT_MINDMAP_INFO=你可以導入 FreeMind 1.0.1 和 WiseMapping 格式的思維導圖。選擇你想要導入的檔。
PRINT=列印
IMPORT_MAP_ERROR=FreeMind 檔不能導入。
MAP_TITLE_ALREADY_EXISTS=已有同名稱圖

View File

@ -1,4 +1,3 @@
##################################################################################
# Database Configuration
##################################################################################
@ -93,7 +92,7 @@ admin.user = admin@wisemapping.org
# Base URL where WiseMapping is deployed. By default, It will be automatically inferred.
# If you are planning to put wisemapping behind an Apache using an Apache Proxy setup, you must enable this property.
#site.baseurl = http:///example.com:8080/wisemapping
#site.baseurl = http://example.com:8080/wisemapping
# Site Homepage URL. This will be used as URL for homepage location.
@ -129,9 +128,9 @@ security.ldap.server.password=password
security.ldap.basedn=dc=wisemapping,dc=com
# This will be concatenated as part of the DN. In this case, I will be ou="people".
# This will be concatenated as part of the DN. In this case, I will be "ou=people".
# In case this need to be changed, modify the wisemapping-security-ldap.xml.
security.ldap.subDn=people
security.ldap.subDn=ou=people
# Attribute used as authentication login (Eg: in this case, the user email will be used)
security.ldap.auth.attribute=mail

View File

@ -45,7 +45,7 @@
<bean id="ldapUserSearch"
class="org.springframework.security.ldap.search.FilterBasedLdapUserSearch">
<constructor-arg index="0" value="ou=${security.ldap.subDn}"/>
<constructor-arg index="0" value="${security.ldap.subDn}"/>
<constructor-arg index="1" value="(${security.ldap.auth.attribute}={0})"/>
<constructor-arg index="2" ref="contextSource"/>
<property name="searchSubtree" value="true"/>

View File

@ -352,8 +352,50 @@ abbr[title] {
padding:0px;
margin:0px;
}
#footerContainer > li.active {
padding:0px;
margin:0px;
}
#foldersContainer > ul > li > a {
padding: 8px 15px;
white-space: nowrap;
}
/* ----------------------------- Icons ----------------------------------- */
#defaultIcon {
background: #eee;
border: 1px solid #ccc !important;
}
#defaultIcon:hover {
background-color: #C8C8C8;
}
.colorInput:hover {
background-color: #C8C8C8;
}
.bs-glyphicons > ul {
padding-left: 10px;
overflow-x: hidden;
}
.bs-glyphicons > ul > li {
float: left;
width: 12%;
height: 20%;
padding: 10px;
font-size: 10px;
line-height: 1.4;
text-align: center;
border: 1px solid #fff;
background-color: #f9f9f9;
cursor: pointer;
}
.bs-glyphicons > ul > li:hover {
background-color: #C8C8C8;
}

View File

@ -0,0 +1,20 @@
// English (US)
jQuery.timeago.settings.strings = {
prefixAgo: null,
prefixFromNow: null,
suffixAgo: "ago",
suffixFromNow: "from now",
seconds: "less than a minute",
minute: "about a minute",
minutes: "%d minutes",
hour: "about an hour",
hours: "about %d hours",
day: "a day",
days: "%d days",
month: "about a month",
months: "%d months",
year: "about a year",
years: "%d years",
wordSeparator: " ",
numbers: []
};

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
../../../../../mindplot/src/main/javascript/libraries/less/less-1.6.2.min.js

View File

@ -66,7 +66,6 @@ jQuery.fn.dataTableExt.removeSelectedRows = function () {
updateStatusToolbar();
};
jQuery.fn.dialogForm = function (options) {
var containerId = this[0].id;
@ -78,7 +77,8 @@ jQuery.fn.dialogForm = function (options) {
// Clear form values ...
if (options.clearForm == undefined || options.clearForm) {
$("#" + containerId).find('input[name!="color"]').val('');
//FIXME: icon and color should be handled as exceptions..
$("#" + containerId).find('input[name!="color"]input[name!="iconName"]').val('');
}
// Clear button "Saving..." state ...
@ -177,7 +177,6 @@ jQuery.fn.dialogForm = function (options) {
};
// Update toolbar events ...
function updateStatusToolbar() {
@ -301,10 +300,15 @@ $(function () {
postUpdate: function(data, id) {
createLabelItem(data, id);
if (mapIds.length > 0) {
linkLabelToMindmap(mapIds, {id: id, title: data.title, color: data.color});
linkLabelToMindmap(mapIds, {id: id, title: data.title, color: data.color, icon: data.icon});
}
}
});
// Setting sizes to label icon list
var dropDownHeight = $(window).height()/3;
$("#labelIconItems ul").height(dropDownHeight);
var dropDownWidth = $(window).width()/3;
$("#labelIconItems ul").width(dropDownWidth);
}
);
@ -531,7 +535,28 @@ $(function () {
$("#foldersContainer ul").css('overflow-x', 'hidden');
$("#foldersContainer ul").height(maxHeight);
})
});
//init popovers...
var icons = $(".bs-glyphicons-list li");
icons.each(function() {
$(this).popover({
animation: true,
placement: "auto",
trigger: 'hover',
//FIXME: Which is the best way to use messages.properties here?
content: ($(this).attr('class').replace('glyphicon glyphicon-',''))
})
});
icons.on("click", function(){
var defaultIcon = $("#defaultIcon");
//remove current icon
defaultIcon.find("i").remove();
var myClass = $(this).attr("class");
defaultIcon.prepend("<i class='" + myClass +"'></i>");
defaultIcon.closest("#iconGroup").find('input').val(myClass);
});
});
/*--------------------------------------------- Label actions --------------------------------------------------**/
@ -540,7 +565,7 @@ function createLabelItem(data, id) {
var labelItem = $("<li data-filter=\"" + data.title + "\">");
labelItem.append(
"<a href=\"#\"> " +
"<i class=\"glyphicon glyphicon-tag labelIcon\"></i>" +
"<i class=\"" + data.iconName + " labelIcon\"></i>" +
"<div class='labelColor' style='background: " + data.color + "'></div>" +
"<div class='labelName labelNameList'>" + data.title + "</div>" +
"<button id='deleteLabelBtn' class='close closeLabel' labelid=\""+ labelId +"\">x</button>" +
@ -611,9 +636,10 @@ function prepareLabelList(labels) {
//append items to dropdown
$.each(labels, function(index, value) {
labelList.append(
$('<li class="chooseLabel"></li>').attr('value', value.id).attr('color', value.color)
$('<li class="chooseLabel"></li>').attr('value', value.id).attr('color', value.color).attr('icon', value.icon)
.append(
'<a href="#" onclick="return false">' +
"<div class='labelIcon " + value.iconName + "'></div>" +
"<div class='labelColor' style='background: " + value.color + "'></div>" +
"<div class='labelName'>" + value.title + "</div>" +
'</a>')

View File

@ -1,19 +1,15 @@
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<c:if test="${requestScope['google.analytics.enabled']}">
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '${requestScope['google.analytics.account']}']);
_gaq.push(['_setDomainName', 'wisemapping.com']);
_gaq.push(['_trackPageview']);
(function () {
var ga = document.createElement('script');
ga.type = 'text/javascript';
ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);
})();
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', '${requestScope['google.analytics.account']}', 'wisemapping.com');
ga('send', 'pageview');
</script>
</c:if>

View File

@ -26,6 +26,7 @@
var svgXml = context.method == "POST" ? window.document.getElementById('workspaceContainer').innerHTML : "";
$('svgXml').setAttribute('value', svgXml);
$('download').setAttribute('value', context.formatType);
$('version').setAttribute('value', context.version);
iframeForm.submit();
}
if (MooDialog.Request.active) {
@ -44,4 +45,5 @@
enctype="application/x-www-form-urlencoded" id="iframeExportForm">
<input name="svgXml" id="svgXml" value="" type="hidden"/>
<input name="download" id="download" type="hidden" value="mm"/>
<input name="version" id="version" type="hidden" value=""/>
</form>

View File

@ -0,0 +1,132 @@
<%@page pageEncoding="UTF-8" %>
<ul class="bs-glyphicons-list">
<li class="glyphicon glyphicon-asterisk"></li>
<li class="glyphicon glyphicon-plus"></li>
<li class="glyphicon glyphicon-euro"></li>
<li class="glyphicon glyphicon-minus"></li>
<li class="glyphicon glyphicon-cloud"></li>
<li class="glyphicon glyphicon-envelope"></li>
<li class="glyphicon glyphicon-pencil"></li>
<li class="glyphicon glyphicon-glass"></li>
<li class="glyphicon glyphicon-music"></li>
<li class="glyphicon glyphicon-search"></li>
<li class="glyphicon glyphicon-heart"></li>
<li class="glyphicon glyphicon-star"></li>
<li class="glyphicon glyphicon-star-empty"></li>
<li class="glyphicon glyphicon-user"></li>
<li class="glyphicon glyphicon-film"></li>
<li class="glyphicon glyphicon-ok"></li>
<li class="glyphicon glyphicon-remove"></li>
<li class="glyphicon glyphicon-signal"></li>
<li class="glyphicon glyphicon-cog"></li>
<li class="glyphicon glyphicon-trash"></li>
<li class="glyphicon glyphicon-home"></li>
<li class="glyphicon glyphicon-file"></li>
<li class="glyphicon glyphicon-time"></li>
<li class="glyphicon glyphicon-download-alt"></li>
<li class="glyphicon glyphicon-download"></li>
<li class="glyphicon glyphicon-upload"></li>
<li class="glyphicon glyphicon-inbox"></li>
<li class="glyphicon glyphicon-repeat"></li>
<li class="glyphicon glyphicon-refresh"></li>
<li class="glyphicon glyphicon-list-alt"></li>
<li class="glyphicon glyphicon-lock"></li>
<li class="glyphicon glyphicon-flag"></li>
<li class="glyphicon glyphicon-headphones"></li>
<li class="glyphicon glyphicon-qrcode"></li>
<li class="glyphicon glyphicon-barcode"></li>
<li class="glyphicon glyphicon-tag"></li>
<li class="glyphicon glyphicon-tags"></li>
<li class="glyphicon glyphicon-book"></li>
<li class="glyphicon glyphicon-bookmark"></li>
<li class="glyphicon glyphicon-print"></li>
<li class="glyphicon glyphicon-camera"></li>
<li class="glyphicon glyphicon-list"></li>
<li class="glyphicon glyphicon-facetime-video"></li>
<li class="glyphicon glyphicon-picture"></li>
<li class="glyphicon glyphicon-map-marker"></li>
<li class="glyphicon glyphicon-adjust"></li>
<li class="glyphicon glyphicon-tint"></li>
<li class="glyphicon glyphicon-edit"></li>
<li class="glyphicon glyphicon-share"></li>
<li class="glyphicon glyphicon-check"></li>
<li class="glyphicon glyphicon-chevron-left"></li>
<li class="glyphicon glyphicon-chevron-right"></li>
<li class="glyphicon glyphicon-plus-sign"></li>
<li class="glyphicon glyphicon-minus-sign"></li>
<li class="glyphicon glyphicon-remove-sign"></li>
<li class="glyphicon glyphicon-ok-sign"></li>
<li class="glyphicon glyphicon-question-sign"></li>
<li class="glyphicon glyphicon-info-sign"></li>
<li class="glyphicon glyphicon-screenshot"></li>
<li class="glyphicon glyphicon-remove-circle"></li>
<li class="glyphicon glyphicon-ok-circle"></li>
<li class="glyphicon glyphicon-ban-circle"></li>
<li class="glyphicon glyphicon-arrow-left"></li>
<li class="glyphicon glyphicon-arrow-right"></li>
<li class="glyphicon glyphicon-arrow-up"></li>
<li class="glyphicon glyphicon-arrow-down"></li>
<li class="glyphicon glyphicon-share-alt"></li>
<li class="glyphicon glyphicon-exclamation-sign"></li>
<li class="glyphicon glyphicon-gift"></li>
<li class="glyphicon glyphicon-leaf"></li>
<li class="glyphicon glyphicon-fire"></li>
<li class="glyphicon glyphicon-eye-open"></li>
<li class="glyphicon glyphicon-eye-close"></li>
<li class="glyphicon glyphicon-warning-sign"></li>
<li class="glyphicon glyphicon-plane"></li>
<li class="glyphicon glyphicon-calendar"></li>
<li class="glyphicon glyphicon-random"></li>
<li class="glyphicon glyphicon-comment"></li>
<li class="glyphicon glyphicon-magnet"></li>
<li class="glyphicon glyphicon-chevron-up"></li>
<li class="glyphicon glyphicon-chevron-down"></li>
<li class="glyphicon glyphicon-shopping-cart"></li>
<li class="glyphicon glyphicon-folder-close"></li>
<li class="glyphicon glyphicon-folder-open"></li>
<li class="glyphicon glyphicon-hdd"></li>
<li class="glyphicon glyphicon-bullhorn"></li>
<li class="glyphicon glyphicon-bell"></li>
<li class="glyphicon glyphicon-certificate"></li>
<li class="glyphicon glyphicon-thumbs-up"></li>
<li class="glyphicon glyphicon-thumbs-down"></li>
<li class="glyphicon glyphicon-hand-right"></li>
<li class="glyphicon glyphicon-hand-left"></li>
<li class="glyphicon glyphicon-hand-up"></li>
<li class="glyphicon glyphicon-hand-down"></li>
<li class="glyphicon glyphicon-circle-arrow-right"></li>
<li class="glyphicon glyphicon-circle-arrow-left"></li>
<li class="glyphicon glyphicon-circle-arrow-up"></li>
<li class="glyphicon glyphicon-circle-arrow-down"></li>
<li class="glyphicon glyphicon-globe"></li>
<li class="glyphicon glyphicon-wrench"></li>
<li class="glyphicon glyphicon-tasks"></li>
<li class="glyphicon glyphicon-filter"></li>
<li class="glyphicon glyphicon-briefcase"></li>
<li class="glyphicon glyphicon-paperclip"></li>
<li class="glyphicon glyphicon-heart-empty"></li>
<li class="glyphicon glyphicon-link"></li>
<li class="glyphicon glyphicon-phone"></li>
<li class="glyphicon glyphicon-pushpin"></li>
<li class="glyphicon glyphicon-usd"></li>
<li class="glyphicon glyphicon-gbp"></li>
<li class="glyphicon glyphicon-unchecked"></li>
<li class="glyphicon glyphicon-flash"></li>
<li class="glyphicon glyphicon-record"></li>
<li class="glyphicon glyphicon-saved"></li>
<li class="glyphicon glyphicon-send"></li>
<li class="glyphicon glyphicon-floppy-disk"></li>
<li class="glyphicon glyphicon-transfer"></li>
<li class="glyphicon glyphicon-cutlery"></li>
<li class="glyphicon glyphicon-header"></li>
<li class="glyphicon glyphicon-compressed"></li>
<li class="glyphicon glyphicon-earphone"></li>
<li class="glyphicon glyphicon-phone-alt"></li>
<li class="glyphicon glyphicon-tower"></li>
<li class="glyphicon glyphicon-stats"></li>
<li class="glyphicon glyphicon-copyright-mark"></li>
<li class="glyphicon glyphicon-registration-mark"></li>
<li class="glyphicon glyphicon-cloud-download"></li>
<li class="glyphicon glyphicon-cloud-upload"></li>
</ul>

View File

@ -10,11 +10,17 @@
enctype="application/x-www-form-urlencoded" id="dialogMainForm">
<input name="svgXml" id="svgXml" value="" type="hidden"/>
<input name="download" type="hidden" value="mm"/>
<input name="version" type="hidden" value=""/>
<fieldset>
<label for="freemind">
<input type="radio" id="freemind" name="exportFormat" value="mm" checked="checked"/>
<input type="radio" id="freemind" name="exportFormat" value="mm" version="1.0.1" checked="checked"/>
<strong><spring:message code="FREEMIND_EXPORT_FORMAT"/></strong><br/>
</label>
<label for="freemind09">
<input type="radio" id="freemind09" name="exportFormat" value="mm" version="0.9.0"/>
<strong><spring:message code="FREEMIND_EXPORT_FORMAT_09"/></strong><br/>
<spring:message code="FREEMIND_EXPORT_FORMAT_DETAILS"/>
</label>
@ -87,7 +93,7 @@
// No way to obtain map svg. Hide panels..
if (window.location.pathname.indexOf('exportf') != -1) {
$('#exportInfo').hide();
$('#freemind,#pdf,#svg,#odt,#txt,#xls,#mmap').click('click', function (event) {
$('#freemind,#freemind09,#pdf,#svg,#odt,#txt,#xls,#mmap').click('click', function (event) {
$('#imgFormat').hide();
});
@ -103,7 +109,6 @@
// If the map is opened, use the latest model ...
var formatType = $('#dialogMainForm input:checked').attr('value');
var form = $('#dialogMainForm');
// Restore default ..
form.attr('action', 'c/restful/maps/${mindmap.id}.' + formatType);
@ -123,6 +128,11 @@
}
var version = $('#dialogMainForm input:checked').attr('version');
if (version) {
$('#dialogMainForm input[name=version]').attr('value', version);
}
$('#dialogMainForm input[name=download]').attr('value', formatType);
if (!differ) {
form.submit();
@ -131,7 +141,7 @@
// Close dialog ...
$('#export-dialog-modal').modal('hide');
return {"action":form.attr('action'), "method":form.attr('method'), formatType:formatType};
return {"action":form.attr('action'), "method":form.attr('method'), "formatType":formatType, "version": version};
}
</script>

View File

@ -25,7 +25,7 @@
<div class="form-group">
<label for="description" class="control-label col-md-2"><spring:message code="DESCRIPTION"/>: </label>
<div class="col-md-10">
<textarea type="text" name="description" id="description"
<textarea name="description" id="description"
placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" class="form-control" maxlength="255"></textarea>
</div>
</div>
@ -46,12 +46,46 @@
$('#dialogMainForm').submit(function (event) {
// Load form parameters ...
var title = $('#dialogMainForm #title').attr('value');
var title = $('#dialogMainForm #title').val();
title = title == undefined ? "" : title;
var description = $('#dialogMainForm #description').attr('value');
var description = $('#dialogMainForm #description').val();
description = description == undefined ? "" : description;
var onSuccess = function (data, textStatus, jqXHR) {
var resourceId = data.getResponseHeader("ResourceId");
window.location = "c/maps/" + resourceId + "/edit";
};
var onError = function (jqXHR, textStatus, errorThrown) {
if (jqXHR.status == 400) {
var errors = JSON.parse(jqXHR.responseText);
// Mark fields with errors ...
var fieldErrors = errors.fieldErrors;
if (fieldErrors) {
for (var fieldName in fieldErrors) {
// Mark the field with errors ...
var message = fieldErrors[fieldName];
var inputField = $("#dialogMainForm input[name='" + fieldName + "']");
$("#dialogMainForm").find(".errorMessage").text(message).addClass("alert alert-danger");
inputField.parent().addClass('error');
}
}
var globalErrors = errors.globalErrors;
if (globalErrors) {
for (var error in globalErrors) {
// Mark the field with errors ...
$("#dialogMainForm").find(".errorMessage").text(error).addClass("alert alert-danger");
inputField.parent().addClass('error');
}
}
} else {
console.log(errorThrown);
console.log(jqXHR);
$('#messagesPanel div').text(errorThrown).parent().show();
}
};
// Save status on click ...
jQuery.ajax("c/restful/maps?title=" + encodeURI(title) + "&description=" + encodeURI(description),
{
@ -60,37 +94,10 @@
type:'POST',
dataType:'json',
contentType:contentType,
success:function (data, textStatus, jqXHR) {
var resourceId = jqXHR.getResponseHeader("ResourceId");
window.location = "c/maps/" + resourceId + "/edit";
},
error:function (jqXHR, textStatus, errorThrown) {
if (jqXHR.status == 400) {
var errors = JSON.parse(jqXHR.responseText);
// Mark fields with errors ...
var fieldErrors = errors.fieldErrors;
if (fieldErrors) {
for (var fieldName in fieldErrors) {
// Mark the field with errors ...
var message = fieldErrors[fieldName];
var inputField = $("#dialogMainForm input[name='" + fieldName + "']");
$("#dialogMainForm").find(".errorMessage").text(message).addClass("alert alert-danger");
inputField.parent().addClass('error');
}
}
var globalErrors = errors.globalErrors;
if (globalErrors) {
for (var error in globalErrors) {
// Mark the field with errors ...
$("#dialogMainForm").find(".errorMessage").text(error).addClass("alert alert-danger");
inputField.parent().addClass('error');
}
}
} else {
console.log(errorThrown);
console.log(jqXHR);
$('#messagesPanel div').text(errorThrown).parent().show();
}
statusCode: {
201: onSuccess,
400: onError,
default: onError
}
});
event.preventDefault();

View File

@ -122,6 +122,12 @@
});
});
</script>
<!--script type="text/javascript" language="javascript">
$(function(){
$("#labelIconList").load("jsp/labelIconList.jsp");
});
</script-->
</head>
<body>
<jsp:include page="header.jsp">
@ -257,19 +263,15 @@
</div>
<div class="col-md-1" style="padding-top:25px">
<c:if test="${requestScope['google.ads.enabled']}">
<script type="text/javascript"><!--
google_ad_client = "ca-pub-7564778578019285";
/* WiseMapping Mindmap List */
google_ad_slot = "4071968444";
google_ad_width = 120;
google_ad_height = 600;
//-->
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<!-- WiseMapping Mindmap List -->
<ins class="adsbygoogle"
style="display:inline-block;width:120px;height:600px"
data-ad-client="ca-pub-7564778578019285"
data-ad-slot="4071968444"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
<div style="margin-top:5px;">
<script type="text/javascript"
src="https://pagead2.googlesyndication.com/pagead/show_ads.js">
</script>
</div>
</c:if>
</div>
</div>
@ -342,10 +344,23 @@
<div id="colorGroup" class="form-group">
<label class="col-md-3 control-label" for="colorChooser"><spring:message code="COLOR"/>:</label>
<div class="col-md-1">
<input class="form-control" name="color" id="colorChooser" style="display: none" type="text" required="required" value="#000000"/>
<input class="form-control" name="color" id="colorChooser" style="display: none" required="required" value="#000000"/>
<span class="input-group-addon colorInput"><i></i></span>
</div>
</div>
<div id="iconGroup" class="form-group">
<label class="col-md-3 control-label" for="iconChooser"><spring:message code="ICON"/>:</label>
<input class="form-control" name="iconName" id="iconChooser" style="display: none" required="required" value="glyphicon glyphicon-tag"/>
<div class="col-md-1">
<div class="btn dropdown-toggle" id="defaultIcon" data-toggle="dropdown">
<i class="glyphicon glyphicon-tag"></i>
</div>
<div id="labelIconList" class="dropdown-menu bs-glyphicons"></div>
<div id="labelIconItems" class="dropdown-menu bs-glyphicons">
<jsp:include page="labelIconList.jsp"/>
</div>
</div>
</div>
</fieldset>
</form>
</div>

View File

@ -55,28 +55,37 @@
<div class="container">
<div class="row">
<div class="col-md-offset-1 col-md-10">
<div class="jumbotron" style="margin:40px 0 100px 0;padding: 10px 60px;">
<div class="jumbotron" style="margin:40px 0 15px 0;padding: 10px 60px;">
<tiles:insertAttribute name="body"/>
</div>
</div>
<div class="col-md-1" style="padding-top:25px">
<c:if test="${requestScope['google.ads.enabled']}">
<script type="text/javascript"><!--
google_ad_client = "ca-pub-7564778578019285";
/* WiseMapping Mindmap List */
google_ad_slot = "4071968444";
google_ad_width = 120;
google_ad_height = 600;
//-->
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<!-- Wise: Lateral Image (Small) -->
<ins class="adsbygoogle"
style="display:inline-block;width:120px;height:240px"
data-ad-client="ca-pub-7564778578019285"
data-ad-slot="6751959325"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
<div style="margin-top:5px;">
<script type="text/javascript"
src="https://pagead2.googlesyndication.com/pagead/show_ads.js">
</script>
</div>
</c:if>
</div>
</div>
<c:if test="${requestScope['google.ads.enabled']}">
<div class="row" style="text-align: center;">
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<!-- Wise: Pages Footer (All pages) -->
<ins class="adsbygoogle"
style="display:inline-block;width:728px;height:90px"
data-ad-client="ca-pub-7564778578019285"
data-ad-slot="3798492923"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
</div>
</c:if>
</div>
<jsp:include page="footer.jsp"/>

View File

@ -0,0 +1,29 @@
package com.wisemapping.test.importer;
import com.wisemapping.importer.ImporterException;
import com.wisemapping.importer.VersionNumber;
import org.testng.Assert;
import org.testng.annotations.Test;
@Test
public class VersionComparisonTest {
@Test
public void compareVersionTest() throws ImporterException {
final VersionNumber greatest = new VersionNumber("1.0.1");
final VersionNumber smaller = new VersionNumber("0.9.0");
final VersionNumber intermediate = new VersionNumber("1.0.0");
Assert.assertTrue(smaller.isSmallerThan(intermediate));
Assert.assertFalse(greatest.isSmallerThan(intermediate));
Assert.assertTrue(greatest.isGreaterThan(smaller));
Assert.assertFalse(intermediate.isGreaterThan(greatest));
Assert.assertTrue(intermediate.equals(intermediate));
Assert.assertFalse(greatest.equals(smaller));
}
}

View File

@ -54,6 +54,9 @@ public class UserAgentTest {
final SupportedUserAgent firefox20 = SupportedUserAgent.create("Mozilla/5.0 (Windows NT 6.1; WOW64; rv:20.0) Gecko/20121215 Firefox/20.0 AppEngine-Google; (+http://code.google.com/appengine; appid: slubuntuk)");
Assert.assertEquals(firefox20.isBrowserSupported(), true);
final SupportedUserAgent firefox30 = SupportedUserAgent.create("Mozilla/5.0 (Windows NT 5.1; rv:31.0) Gecko/20100101 Firefox/31.0");
Assert.assertEquals(firefox30.isBrowserSupported(), true);
}

View File

@ -30,6 +30,7 @@ public class RestLabelITCase {
private String userEmail;
private static final String COLOR = "#000000";
private static final String ICON = "glyphicon glyphicon-tag";
@BeforeClass
void createUser() {
@ -45,11 +46,11 @@ public class RestLabelITCase {
// Create a new label
final String title1 = "Label 1 - " + mediaType.toString();
addNewLabel(requestHeaders, template, title1, COLOR);
addNewLabel(requestHeaders, template, title1, COLOR, ICON);
// Create a new label
final String title2 = "Label 2 - " + mediaType.toString();
addNewLabel(requestHeaders, template, title2, COLOR);
addNewLabel(requestHeaders, template, title2, COLOR, ICON);
// Check that the label has been created ...
final RestLabelList restLabelList = getLabels(requestHeaders, template);
@ -83,7 +84,7 @@ public class RestLabelITCase {
final RestTemplate template = RestHelper.createTemplate( userEmail + ":" + "admin");
try {
addNewLabel(requestHeaders, template, null, COLOR);
addNewLabel(requestHeaders, template, null, COLOR, ICON);
fail("Wrong response");
} catch (HttpClientErrorException e) {
final String responseBodyAsString = e.getResponseBodyAsString();
@ -91,12 +92,21 @@ public class RestLabelITCase {
}
try {
addNewLabel(requestHeaders, template, "title12345", null);
addNewLabel(requestHeaders, template, "title12345", null, ICON);
fail("Wrong response");
} catch (HttpClientErrorException e) {
final String responseBodyAsString = e.getResponseBodyAsString();
assert (responseBodyAsString.contains("Required field cannot be left blank"));
}
try {
addNewLabel(requestHeaders, template, "title12345", COLOR, null);
fail("Wrong response");
} catch (HttpClientErrorException e) {
final String responseBodyAsString = e.getResponseBodyAsString();
assert (responseBodyAsString.contains("Required field cannot be left blank"));
}
}
@Test(dataProviderClass = RestHelper.class, dataProvider="ContentType-Provider-Function")
@ -105,7 +115,7 @@ public class RestLabelITCase {
final RestTemplate template = RestHelper.createTemplate( userEmail + ":" + "admin");
final String title = "title to delete";
final URI resourceUri = addNewLabel(requestHeaders, template, title, COLOR);
final URI resourceUri = addNewLabel(requestHeaders, template, title, COLOR, ICON);
// Now remove it ...
template.delete(RestHelper.HOST_PORT + resourceUri.toString());
@ -119,7 +129,7 @@ public class RestLabelITCase {
}
static URI addNewLabel(@NotNull HttpHeaders requestHeaders, @NotNull RestTemplate template, @Nullable String title, @Nullable String color ) throws IOException, WiseMappingException {
static URI addNewLabel(@NotNull HttpHeaders requestHeaders, @NotNull RestTemplate template, @Nullable String title, @Nullable String color, @Nullable String icon) throws IOException, WiseMappingException {
final RestLabel restLabel = new RestLabel();
if (title != null) {
restLabel.setTitle(title);
@ -127,6 +137,9 @@ public class RestLabelITCase {
if (color != null) {
restLabel.setColor(color);
}
if (icon != null) {
restLabel.setIconName(icon);
}
// Create a new label ...
HttpEntity<RestLabel> createUserEntity = new HttpEntity<RestLabel>(restLabel, requestHeaders);

View File

@ -40,6 +40,7 @@ import static org.testng.Assert.fail;
public class RestMindmapITCase {
private String userEmail = "admin@wisemapping.com";
private static final String ICON = "glyphicon glyphicon-tag";
@BeforeClass
void createUser() {
@ -251,7 +252,7 @@ public class RestMindmapITCase {
// Create a new label
final String titleLabel = "Label 1 - " + mediaType.toString();
final URI labelUri = RestLabelITCase.addNewLabel(requestHeaders, template, titleLabel, COLOR);
final URI labelUri = RestLabelITCase.addNewLabel(requestHeaders, template, titleLabel, COLOR, ICON);
// Create a sample map ...
final String mapTitle = "Maps 1 - " + mediaType.toString();

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,251 +1,251 @@
\chapter{corona}\label{ID_null}
\section{Modelo in world}\label{ID_null}
\subsection{International market protected Modelo from unstable peso}\label{ID_null}
\subsection{Fifth largest distributor in world}\label{ID_null}
\subsubsection{Can they sustain that trend}\label{ID_null}
\subsubsection{in 12 years}\label{ID_null}
\subsection{One of top 10 breweries in world}\label{ID_null}
\section{Carloz Fernandez CEO}\label{ID_null}
\subsection{CEO Since 1997}\label{ID_null}
\subsubsection{29 years old}\label{ID_null}working there since 13\par
\subsection{vision: top five brewers}\label{ID_null}
\subsubsection{International Business model}\label{ID_null}\begin{itemize}
\item \label{ID_null}experienced local distributors\par
\item \label{ID_null}Growing international demand\par
\item \label{ID_null}Capitalize on NAFTA\par
\end{itemize}
\subsubsection{top 10 beer producers in world}\label{ID_null}\begin{itemize}
\item \label{ID_null}7.8 % sales growth compounded over ten years\par
\item \label{ID_null}2005\par
\begin{itemize}
\item \label{ID_null}12.3 % exports\par
\item \label{ID_null}4% increase domestically\par
\item \label{ID_null}export sales 30%\par
\end{itemize}
\item \label{ID_null}Corona Extra\par
\begin{itemize}
\item \label{ID_null}worlds fourth best selling beer\par
\item \label{ID_null}56% shar of domestic market\par
\item \label{ID_null}Since 1997 #1 import in US\par
outsold competitor by 50%\par
\end{itemize}
\end{itemize}
\subsection{Expanding production }\label{ID_null}
\subsubsection{renovate facility in Zacatecas}\label{ID_null}
\subsubsection{300 million investment}\label{ID_null}
\section{US Beer Market}\label{ID_null}
\subsection{2nd largest nest to China}\label{ID_null}
\subsection{Consumption six times higher per cap}\label{ID_null}
\subsection{Groth expectations reduced}\label{ID_null}
\subsection{80% of market}\label{ID_null}
\subsubsection{AB}\label{ID_null}75% of industry profits\par
\subsubsection{adolf coors}\label{ID_null}
\subsubsection{Miller}\label{ID_null}
\subsection{dense network of regional craft brewing}\label{ID_null}
\subsection{volume main driver}\label{ID_null}
\section{Modelo in Mexico}\label{ID_null}
\subsection{History to 1970}\label{ID_null}
\subsubsection{formed in 1922}\label{ID_null}\begin{itemize}
\item \label{ID_null}Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr\par
\item \label{ID_null}Iriarte died in 1932\par
\item \label{ID_null}Diez sole owner 1936\par
\item \label{ID_null}Fernandez Family Sole owner since 1936\par
\end{itemize}
\subsubsection{focus on Mexico City}\label{ID_null}
\subsubsection{Modelo 1st Brand}\label{ID_null}
\subsubsection{Corona 2nd Brand}\label{ID_null}Clear Glass Customers preference\par
\subsubsection{1940s period of strong growth }\label{ID_null}\begin{itemize}
\item \label{ID_null}concentrate domesti¬cally \par
\item \label{ID_null}improve distribution methods and produc¬tion facilities \par
distribution: direct with profit sharing\par
\end{itemize}
\subsubsection{bought the brands and assets of the Toluca y Mexico Brewery}\label{ID_null}\begin{itemize}
\item \label{ID_null}1935\par
\item \label{ID_null}country's oldest brand of beer\par
\end{itemize}
\subsection{1971, Antonino Fernandez was appointed CEO}\label{ID_null}
\subsubsection{Mexican Stock exchange in 1994}\label{ID_null}
\subsubsection{Anheuser-Busch 17.7 % of the equity}\label{ID_null}The 50.2 % represented 43.9% voting\par
\subsection{Largest Beer producer and distrubutor in Mexico}\label{ID_null}
\subsubsection{corona 56% share}\label{ID_null}
\section{Modelo in US}\label{ID_null}
\subsection{History}\label{ID_null}
\subsubsection{1979}\label{ID_null}
\subsubsection{Amalgamated Distillery Products Inc. (}\label{ID_null}later renamed Barton Beers Ltd.\par
\subsubsection{gained popularity in southern states}\label{ID_null}
\subsubsection{rapid growth 1980s}\label{ID_null}second most popular imported beer\par
\subsubsection{1991}\label{ID_null}\begin{itemize}
\item \label{ID_null}doubling of federal excise tax on beer\par
\begin{itemize}
\item \label{ID_null}sales decrease of 15 percent\par
\item \label{ID_null}distributor absorb the tax 92\par
\end{itemize}
\item \label{ID_null}distributors took the loss\par
\end{itemize}
\subsection{2007 5 beers to us}\label{ID_null}
\subsubsection{3 of top 8 beers in US}\label{ID_null}
\subsubsection{Heineken}\label{ID_null}Main Import Comptitor\par
\subsubsection{131 million cases}\label{ID_null}
\subsection{Marketing}\label{ID_null}
\subsubsection{surfing mythology}\label{ID_null}
\subsubsection{not selling premium quality}\label{ID_null}
\subsubsection{not testosterone driven}\label{ID_null}
\subsubsection{found new following}\label{ID_null}
\subsubsection{beer for non beer drinkers}\label{ID_null}
\subsubsection{dependable second choise}\label{ID_null}
\subsubsection{Fun in the sun}\label{ID_null}\begin{itemize}
\item \label{ID_null}Barton Beer's idea\par
\item \label{ID_null}escape\par
\item \label{ID_null}relaxation\par
\end{itemize}
\subsubsection{1996ad budget}\label{ID_null}\begin{itemize}
\item \label{ID_null}Corona 5.1 mil\par
\item \label{ID_null}Heiniken 15 mil\par
\item \label{ID_null}an bsch 192 mil\par
\end{itemize}
\subsection{Us dist contracts}\label{ID_null}
\subsubsection{importer/distributors}\label{ID_null}\begin{itemize}
\item \label{ID_null}Local Companies\par
\item \label{ID_null}Autonomous\par
\item \label{ID_null}competitive relationship\par
\item \label{ID_null}transportation\par
\item \label{ID_null}insurance\par
\item \label{ID_null}pricing\par
\item \label{ID_null}customs\par
\item \label{ID_null}advertixing\par
\end{itemize}
\subsubsection{procermex inc}\label{ID_null}\begin{itemize}
\item \label{ID_null}Modelo us subsidiary\par
\item \label{ID_null}Support\par
\item \label{ID_null}Supervise\par
\item \label{ID_null}Coordinate\par
\end{itemize}
\subsubsection{Modelo had final say on brand image}\label{ID_null}
\subsubsection{production in Mexico}\label{ID_null}
\subsubsection{Chicago based Barton Beers 1st}\label{ID_null}largest importer in 25 western states\par
\subsubsection{Gambrinus}\label{ID_null}\begin{itemize}
\item \label{ID_null}1986\par
\item \label{ID_null}eastern dist\par
\end{itemize}
\section{The Beer market}\label{ID_null}
\subsection{traditionally a clustered market}\label{ID_null}
\subsection{many local breweries}\label{ID_null}
\subsection{no means of transport}\label{ID_null}
\subsection{colsolition happened in 1800s}\label{ID_null}
\subsection{different countries had different tastes}\label{ID_null}
\subsection{90s national leaders expanded abroad}\label{ID_null}
\subsection{startup costs high}\label{ID_null}
\subsubsection{industry supported conectration}\label{ID_null}
\subsection{Interbrew}\label{ID_null}
\subsubsection{Belgian}\label{ID_null}
\subsubsection{aquired breweries in 20 countries}\label{ID_null}
\subsubsection{sales in 110 countries}\label{ID_null}
\subsubsection{local managers controlling brands}\label{ID_null}
\subsubsection{flagship brand: Stella Artois}\label{ID_null}
\subsection{2004 merger}\label{ID_null}
\subsubsection{#1 Interbrew}\label{ID_null}
\subsubsection{#5 Am Bev - Brazil}\label{ID_null}
\subsubsection{largest merge}\label{ID_null}worth 12.8 billion\par
\subsection{Future}\label{ID_null}
\subsubsection{Sales were decreasing due to competitive media budgets}\label{ID_null}
\subsubsection{Inbev in talks with Anh Bush}\label{ID_null}Two biggest companies will create huge company\par
\subsubsection{other merger talks}\label{ID_null}
\subsubsection{domestic and foreign threats}\label{ID_null}
\subsection{Beer Marketing}\label{ID_null}
\subsubsection{People drink marketing}\label{ID_null}
\subsection{2007}\label{ID_null}
\subsubsection{inbev}\label{ID_null}
\subsubsection{SAP Miller}\label{ID_null}
\subsubsection{Anh Bush}\label{ID_null}produces in foreign markets\par
\subsubsection{Heineken}\label{ID_null}\begin{itemize}
\item \label{ID_null}Dutch\par
\item \label{ID_null}reputation of top selling beer in world\par
\item \label{ID_null}marketing\par
\begin{itemize}
\item \label{ID_null}2006 aggressive marketing campaign\par
Heineken Premium Light\par
\item \label{ID_null}superior taste\par
\item \label{ID_null}no mythology\par
\item \label{ID_null}premium brand\par
\item \label{ID_null}premium beer\par
\end{itemize}
\item \label{ID_null}produces beer domestically\par
parent of local distributors\par
\begin{itemize}
\item \label{ID_null}marketing\par
\item \label{ID_null}distribution\par
\item \label{ID_null}importing\par
import taxes passed on to consumer\par
\item \label{ID_null}distribution\par
\item \label{ID_null}marketing\par
\end{itemize}
\item \label{ID_null}marketing\par
\end{itemize}
\subsubsection{SAP Miller}\label{ID_null}
\subsubsection{inbev}\label{ID_null}
\subsection{2004 merger}\label{ID_null}
\subsubsection{largest merge}\label{ID_null}worth 12.8 billion\par
\subsubsection{#5 Am Bev - Brazil}\label{ID_null}
\subsubsection{#1 Interbrew}\label{ID_null}
\subsection{Interbrew}\label{ID_null}
\subsubsection{flagship brand: Stella Artois}\label{ID_null}
\subsubsection{local managers controlling brands}\label{ID_null}
\subsubsection{sales in 110 countries}\label{ID_null}
\subsubsection{aquired breweries in 20 countries}\label{ID_null}
\subsubsection{Belgian}\label{ID_null}
\subsection{startup costs high}\label{ID_null}
\subsubsection{industry supported conectration}\label{ID_null}
\subsection{90s national leaders expanded abroad}\label{ID_null}
\subsection{different countries had different tastes}\label{ID_null}
\subsection{colsolition happened in 1800s}\label{ID_null}
\subsection{no means of transport}\label{ID_null}
\subsection{many local breweries}\label{ID_null}
\subsection{traditionally a clustered market}\label{ID_null}
\section{Carloz Fernandez CEO}\label{ID_null}
\subsection{Expanding production }\label{ID_null}
\subsubsection{300 million investment}\label{ID_null}
\subsubsection{renovate facility in Zacatecas}\label{ID_null}
\subsection{vision: top five brewers}\label{ID_null}
\subsubsection{top 10 beer producers in world}\label{ID_null}\begin{itemize}
\item \label{ID_null}Corona Extra\par
\begin{itemize}
\item \label{ID_null}premium beer\par
\item \label{ID_null}premium brand\par
\item \label{ID_null}no mythology\par
\item \label{ID_null}superior taste\par
\item \label{ID_null}2006 aggressive marketing campaign\par
Heineken Premium Light\par
\item \label{ID_null}Since 1997 #1 import in US\par
outsold competitor by 50%\par
\item \label{ID_null}56% shar of domestic market\par
\item \label{ID_null}worlds fourth best selling beer\par
\end{itemize}
\item \label{ID_null}reputation of top selling beer in world\par
\item \label{ID_null}Dutch\par
\item \label{ID_null}2005\par
\begin{itemize}
\item \label{ID_null}export sales 30%\par
\item \label{ID_null}4% increase domestically\par
\item \label{ID_null}12.3 % exports\par
\end{itemize}
\item \label{ID_null}7.8 % sales growth compounded over ten years\par
\end{itemize}
\subsubsection{Anh Bush}\label{ID_null}produces in foreign markets\par
\subsubsection{International Business model}\label{ID_null}\begin{itemize}
\item \label{ID_null}Capitalize on NAFTA\par
\item \label{ID_null}Growing international demand\par
\item \label{ID_null}experienced local distributors\par
\subsection{Beer Marketing}\label{ID_null}
\subsubsection{People drink marketing}\label{ID_null}
\subsection{Future}\label{ID_null}
\subsubsection{domestic and foreign threats}\label{ID_null}
\subsubsection{other merger talks}\label{ID_null}
\subsubsection{Inbev in talks with Anh Bush}\label{ID_null}Two biggest companies will create huge company\par
\end{itemize}
\subsubsection{Sales were decreasing due to competitive media budgets}\label{ID_null}
\subsection{CEO Since 1997}\label{ID_null}
\subsubsection{29 years old}\label{ID_null}working there since 13\par
\section{Modelo in world}\label{ID_null}
\subsection{One of top 10 breweries in world}\label{ID_null}
\subsection{Fifth largest distributor in world}\label{ID_null}
\subsubsection{in 12 years}\label{ID_null}
\subsubsection{Can they sustain that trend}\label{ID_null}
\subsection{International market protected Modelo from unstable peso}\label{ID_null}
\section{Mexico Industry}\label{ID_null}
\subsection{has most trade agreements in world}\label{ID_null}
\subsection{one of the largest domestic beer markets}\label{ID_null}
\subsection{imported beer only 1% sales}\label{ID_null}
\subsubsection{half were anh bcsh dist by modelo}\label{ID_null}
\subsection{modelo}\label{ID_null}
\subsubsection{NAFTA S.A. An Bucsh}\label{ID_null}
\subsubsection{62.8% of market}\label{ID_null}
\subsection{FEMSA}\label{ID_null}
\subsubsection{foriegn market}\label{ID_null}\begin{itemize}
\item \label{ID_null}Recently partnered with Heiniken for US market\par
2005 18.7% growth\par
\item \label{ID_null}90s entry to us market failed\par
\item \label{ID_null}Partnership Heiniken\par
Distribution in US\par
\end{itemize}
\subsubsection{domestic market}\label{ID_null}\begin{itemize}
\item \label{ID_null}37% of domestic market\par
\item \label{ID_null}production and distribution in Mexico: peso not a threat\par
\item \label{ID_null}NAFTA SACoca cola\par
Exclusive distributor\par
\item \label{ID_null}997 to 2004 taking domestic market share\par
\item \label{ID_null}leads domestic premium beer market\par
\item \label{ID_null}Owns Oxxo C\par
CA largest chain of conv stores\par
\item \label{ID_null}leads domestic premium beer market\par
\item \label{ID_null}997 to 2004 taking domestic market share\par
\item \label{ID_null}NAFTA SACoca cola\par
Exclusive distributor\par
\item \label{ID_null}production and distribution in Mexico: peso not a threat\par
\item \label{ID_null}37% of domestic market\par
\end{itemize}
\subsubsection{foriegn market}\label{ID_null}\begin{itemize}
\item \label{ID_null}Partnership Heiniken\par
Distribution in US\par
\item \label{ID_null}90s entry to us market failed\par
\item \label{ID_null}Recently partnered with Heiniken for US market\par
2005 18.7% growth\par
\subsection{modelo}\label{ID_null}
\subsubsection{62.8% of market}\label{ID_null}
\subsubsection{NAFTA S.A. An Bucsh}\label{ID_null}
\subsection{imported beer only 1% sales}\label{ID_null}
\subsubsection{half were anh bcsh dist by modelo}\label{ID_null}
\subsection{one of the largest domestic beer markets}\label{ID_null}
\subsection{has most trade agreements in world}\label{ID_null}
\section{Modelo in Mexico}\label{ID_null}
\subsection{Largest Beer producer and distrubutor in Mexico}\label{ID_null}
\subsubsection{corona 56% share}\label{ID_null}
\subsection{1971, Antonino Fernandez was appointed CEO}\label{ID_null}
\subsubsection{Anheuser-Busch 17.7 % of the equity}\label{ID_null}The 50.2 % represented 43.9% voting\par
\subsubsection{Mexican Stock exchange in 1994}\label{ID_null}
\subsection{History to 1970}\label{ID_null}
\subsubsection{bought the brands and assets of the Toluca y Mexico Brewery}\label{ID_null}\begin{itemize}
\item \label{ID_null}country's oldest brand of beer\par
\item \label{ID_null}1935\par
\end{itemize}
\subsubsection{1940s period of strong growth }\label{ID_null}\begin{itemize}
\item \label{ID_null}improve distribution methods and produc¬tion facilities \par
distribution: direct with profit sharing\par
\item \label{ID_null}concentrate domesti¬cally \par
\end{itemize}
\subsubsection{Corona 2nd Brand}\label{ID_null}Clear Glass Customers preference\par
\subsubsection{Modelo 1st Brand}\label{ID_null}
\subsubsection{focus on Mexico City}\label{ID_null}
\subsubsection{formed in 1922}\label{ID_null}\begin{itemize}
\item \label{ID_null}Fernandez Family Sole owner since 1936\par
\item \label{ID_null}Diez sole owner 1936\par
\item \label{ID_null}Iriarte died in 1932\par
\item \label{ID_null}Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr\par
\end{itemize}
\section{US Beer Market}\label{ID_null}
\subsection{volume main driver}\label{ID_null}
\subsection{dense network of regional craft brewing}\label{ID_null}
\subsection{80% of market}\label{ID_null}
\subsubsection{Miller}\label{ID_null}
\subsubsection{adolf coors}\label{ID_null}
\subsubsection{AB}\label{ID_null}75% of industry profits\par
\subsection{Groth expectations reduced}\label{ID_null}
\subsection{Consumption six times higher per cap}\label{ID_null}
\subsection{2nd largest nest to China}\label{ID_null}
\section{Modelo in US}\label{ID_null}
\subsection{Us dist contracts}\label{ID_null}
\subsubsection{Gambrinus}\label{ID_null}\begin{itemize}
\item \label{ID_null}eastern dist\par
\item \label{ID_null}1986\par
\end{itemize}
\subsubsection{Chicago based Barton Beers 1st}\label{ID_null}largest importer in 25 western states\par
\subsubsection{production in Mexico}\label{ID_null}
\subsubsection{Modelo had final say on brand image}\label{ID_null}
\subsubsection{procermex inc}\label{ID_null}\begin{itemize}
\item \label{ID_null}Coordinate\par
\item \label{ID_null}Supervise\par
\item \label{ID_null}Support\par
\item \label{ID_null}Modelo us subsidiary\par
\end{itemize}
\subsubsection{importer/distributors}\label{ID_null}\begin{itemize}
\item \label{ID_null}advertixing\par
\item \label{ID_null}customs\par
\item \label{ID_null}pricing\par
\item \label{ID_null}insurance\par
\item \label{ID_null}transportation\par
\item \label{ID_null}competitive relationship\par
\item \label{ID_null}Autonomous\par
\item \label{ID_null}Local Companies\par
\end{itemize}
\subsection{Marketing}\label{ID_null}
\subsubsection{1996ad budget}\label{ID_null}\begin{itemize}
\item \label{ID_null}an bsch 192 mil\par
\item \label{ID_null}Heiniken 15 mil\par
\item \label{ID_null}Corona 5.1 mil\par
\end{itemize}
\subsubsection{Fun in the sun}\label{ID_null}\begin{itemize}
\item \label{ID_null}relaxation\par
\item \label{ID_null}escape\par
\item \label{ID_null}Barton Beer's idea\par
\end{itemize}
\subsubsection{dependable second choise}\label{ID_null}
\subsubsection{beer for non beer drinkers}\label{ID_null}
\subsubsection{found new following}\label{ID_null}
\subsubsection{not testosterone driven}\label{ID_null}
\subsubsection{not selling premium quality}\label{ID_null}
\subsubsection{surfing mythology}\label{ID_null}
\subsection{2007 5 beers to us}\label{ID_null}
\subsubsection{131 million cases}\label{ID_null}
\subsubsection{Heineken}\label{ID_null}Main Import Comptitor\par
\subsubsection{3 of top 8 beers in US}\label{ID_null}
\subsection{History}\label{ID_null}
\subsubsection{1991}\label{ID_null}\begin{itemize}
\item \label{ID_null}distributors took the loss\par
\item \label{ID_null}doubling of federal excise tax on beer\par
\begin{itemize}
\item \label{ID_null}distributor absorb the tax 92\par
\item \label{ID_null}sales decrease of 15 percent\par
\end{itemize}
\end{itemize}
\subsubsection{rapid growth 1980s}\label{ID_null}second most popular imported beer\par
\subsubsection{gained popularity in southern states}\label{ID_null}
\subsubsection{Amalgamated Distillery Products Inc. (}\label{ID_null}later renamed Barton Beers Ltd.\par
\subsubsection{1979}\label{ID_null}

View File

@ -1,262 +1,262 @@
<map version="0.9.0">
<map version="1.0.1">
<node ID="ID_null" TEXT="corona">
<node ID="ID_null" POSITION="left" TEXT="Modelo in world">
<node ID="ID_null" POSITION="left" TEXT="International market protected Modelo from unstable peso"/>
<node ID="ID_null" POSITION="left" TEXT="Fifth largest distributor in world">
<node ID="ID_null" POSITION="left" TEXT="Can they sustain that trend"/>
<node ID="ID_null" POSITION="left" TEXT="in 12 years"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="One of top 10 breweries in world"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="Carloz Fernandez CEO">
<node ID="ID_null" POSITION="left" TEXT="CEO Since 1997">
<node ID="ID_null" POSITION="left" TEXT="29 years old">
<node ID="ID_null" POSITION="left" TEXT="working there since 13"/>
<node ID="ID_null" POSITION="right" STYLE="fork" TEXT="The Beer market">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Future">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Sales were decreasing due to competitive media budgets"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Inbev in talks with Anh Bush">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Two biggest companies will create huge company"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="other merger talks"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="domestic and foreign threats"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="vision: top five brewers">
<node ID="ID_null" POSITION="left" TEXT="International Business model">
<node ID="ID_null" POSITION="left" TEXT="experienced local distributors"/>
<node ID="ID_null" POSITION="left" TEXT="Growing international demand"/>
<node ID="ID_null" POSITION="left" TEXT="Capitalize on NAFTA"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Beer Marketing">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="People drink marketing"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="2007">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Anh Bush">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="produces in foreign markets"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="top 10 beer producers in world">
<node ID="ID_null" POSITION="left" TEXT="7.8 % sales growth compounded over ten years"/>
<node ID="ID_null" POSITION="left" TEXT="2005">
<node ID="ID_null" POSITION="left" TEXT="12.3 % exports"/>
<node ID="ID_null" POSITION="left" TEXT="4% increase domestically"/>
<node ID="ID_null" POSITION="left" TEXT="export sales 30%"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="Corona Extra">
<node ID="ID_null" POSITION="left" TEXT="worlds fourth best selling beer"/>
<node ID="ID_null" POSITION="left" TEXT="56% shar of domestic market"/>
<node ID="ID_null" POSITION="left" TEXT="Since 1997 #1 import in US">
<node ID="ID_null" POSITION="left" TEXT="outsold competitor by 50%"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Heineken">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Dutch"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="reputation of top selling beer in world"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="marketing">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="2006 aggressive marketing campaign">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Heineken Premium Light"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="superior taste"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="no mythology"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="premium brand"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="premium beer"/>
</node>
</node>
</node>
<node ID="ID_null" POSITION="left" TEXT="Expanding production ">
<node ID="ID_null" POSITION="left" TEXT="renovate facility in Zacatecas"/>
<node ID="ID_null" POSITION="left" TEXT="300 million investment"/>
</node>
</node>
<node ID="ID_null" POSITION="left" TEXT="US Beer Market">
<node ID="ID_null" POSITION="left" TEXT="2nd largest nest to China"/>
<node ID="ID_null" POSITION="left" TEXT="Consumption six times higher per cap"/>
<node ID="ID_null" POSITION="left" TEXT="Groth expectations reduced"/>
<node ID="ID_null" POSITION="left" TEXT="80% of market">
<node ID="ID_null" POSITION="left" TEXT="AB">
<node ID="ID_null" POSITION="left" TEXT="75% of industry profits"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="adolf coors"/>
<node ID="ID_null" POSITION="left" TEXT="Miller"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="dense network of regional craft brewing"/>
<node ID="ID_null" POSITION="left" TEXT="volume main driver"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="Modelo in Mexico">
<node ID="ID_null" POSITION="left" TEXT="History to 1970">
<node ID="ID_null" POSITION="left" TEXT="formed in 1922">
<node ID="ID_null" POSITION="left" TEXT="Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr"/>
<node ID="ID_null" POSITION="left" TEXT="Iriarte died in 1932"/>
<node ID="ID_null" POSITION="left" TEXT="Diez sole owner 1936"/>
<node ID="ID_null" POSITION="left" TEXT="Fernandez Family Sole owner since 1936"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="focus on Mexico City"/>
<node ID="ID_null" POSITION="left" TEXT="Modelo 1st Brand"/>
<node ID="ID_null" POSITION="left" TEXT="Corona 2nd Brand">
<node ID="ID_null" POSITION="left" TEXT="Clear Glass Customers preference"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="1940s period of strong growth ">
<node ID="ID_null" POSITION="left" TEXT="concentrate domesti&#172;cally "/>
<node ID="ID_null" POSITION="left" TEXT="improve distribution methods and produc&#172;tion facilities ">
<node ID="ID_null" POSITION="left" TEXT="distribution: direct with profit sharing"/>
</node>
</node>
<node ID="ID_null" POSITION="left" TEXT="bought the brands and assets of the Toluca y Mexico Brewery">
<node ID="ID_null" POSITION="left" TEXT="1935"/>
<node ID="ID_null" POSITION="left" TEXT="country's oldest brand of beer"/>
</node>
</node>
<node ID="ID_null" POSITION="left" TEXT="1971, Antonino Fernandez was appointed CEO">
<node ID="ID_null" POSITION="left" TEXT="Mexican Stock exchange in 1994"/>
<node ID="ID_null" POSITION="left" TEXT="Anheuser-Busch 17.7 % of the equity">
<node ID="ID_null" POSITION="left" TEXT="The 50.2 % represented 43.9% voting"/>
</node>
</node>
<node ID="ID_null" POSITION="left" TEXT="Largest Beer producer and distrubutor in Mexico">
<node ID="ID_null" POSITION="left" TEXT="corona 56% share"/>
</node>
</node>
<node ID="ID_null" POSITION="right" TEXT="Modelo in US">
<node ID="ID_null" POSITION="left" TEXT="History">
<node ID="ID_null" POSITION="left" TEXT="1979"/>
<node ID="ID_null" POSITION="left" TEXT="Amalgamated Distillery Products Inc. (">
<node ID="ID_null" POSITION="left" TEXT="later renamed Barton Beers Ltd."/>
</node>
<node ID="ID_null" POSITION="left" TEXT="gained popularity in southern states"/>
<node ID="ID_null" POSITION="left" TEXT="rapid growth 1980s">
<node ID="ID_null" POSITION="left" TEXT="second most popular imported beer"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="1991">
<node ID="ID_null" POSITION="left" TEXT="doubling of federal excise tax on beer">
<node ID="ID_null" POSITION="left" TEXT="sales decrease of 15 percent"/>
<node ID="ID_null" POSITION="left" TEXT="distributor absorb the tax 92"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="distributors took the loss"/>
</node>
</node>
<node ID="ID_null" POSITION="left" TEXT="2007 5 beers to us">
<node ID="ID_null" POSITION="left" TEXT="3 of top 8 beers in US"/>
<node ID="ID_null" POSITION="left" TEXT="Heineken">
<node ID="ID_null" POSITION="left" TEXT="Main Import Comptitor"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="131 million cases"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="Marketing">
<node ID="ID_null" POSITION="left" TEXT="surfing mythology"/>
<node ID="ID_null" POSITION="left" TEXT="not selling premium quality"/>
<node ID="ID_null" POSITION="left" TEXT="not testosterone driven"/>
<node ID="ID_null" POSITION="left" TEXT="found new following"/>
<node ID="ID_null" POSITION="left" TEXT="beer for non beer drinkers"/>
<node ID="ID_null" POSITION="left" TEXT="dependable second choise"/>
<node ID="ID_null" POSITION="left" TEXT="Fun in the sun">
<node ID="ID_null" POSITION="left" TEXT="Barton Beer's idea"/>
<node ID="ID_null" POSITION="left" TEXT="escape"/>
<node ID="ID_null" POSITION="left" TEXT="relaxation"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="1996ad budget">
<node ID="ID_null" POSITION="left" TEXT="Corona 5.1 mil"/>
<node ID="ID_null" POSITION="left" TEXT="Heiniken 15 mil"/>
<node ID="ID_null" POSITION="left" TEXT="an bsch 192 mil"/>
</node>
</node>
<node ID="ID_null" POSITION="left" TEXT="Us dist contracts">
<node ID="ID_null" POSITION="left" TEXT="importer/distributors">
<node ID="ID_null" POSITION="left" TEXT="Local Companies"/>
<node ID="ID_null" POSITION="left" TEXT="Autonomous"/>
<node ID="ID_null" POSITION="left" TEXT="competitive relationship"/>
<node ID="ID_null" POSITION="left" TEXT="transportation"/>
<node ID="ID_null" POSITION="left" TEXT="insurance"/>
<node ID="ID_null" POSITION="left" TEXT="pricing"/>
<node ID="ID_null" POSITION="left" TEXT="customs"/>
<node ID="ID_null" POSITION="left" TEXT="advertixing"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="procermex inc">
<node ID="ID_null" POSITION="left" TEXT="Modelo us subsidiary"/>
<node ID="ID_null" POSITION="left" TEXT="Support"/>
<node ID="ID_null" POSITION="left" TEXT="Supervise"/>
<node ID="ID_null" POSITION="left" TEXT="Coordinate"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="Modelo had final say on brand image"/>
<node ID="ID_null" POSITION="left" TEXT="production in Mexico"/>
<node ID="ID_null" POSITION="left" TEXT="Chicago based Barton Beers 1st">
<node ID="ID_null" POSITION="left" TEXT="largest importer in 25 western states"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="Gambrinus">
<node ID="ID_null" POSITION="left" TEXT="1986"/>
<node ID="ID_null" POSITION="left" TEXT="eastern dist"/>
</node>
</node>
</node>
<node ID="ID_null" POSITION="right" TEXT="The Beer market">
<node ID="ID_null" POSITION="left" TEXT="traditionally a clustered market"/>
<node ID="ID_null" POSITION="left" TEXT="many local breweries"/>
<node ID="ID_null" POSITION="left" TEXT="no means of transport"/>
<node ID="ID_null" POSITION="left" TEXT="colsolition happened in 1800s"/>
<node ID="ID_null" POSITION="left" TEXT="different countries had different tastes"/>
<node ID="ID_null" POSITION="left" TEXT="90s national leaders expanded abroad"/>
<node ID="ID_null" POSITION="left" TEXT="startup costs high">
<node ID="ID_null" POSITION="left" TEXT="industry supported conectration"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="Interbrew">
<node ID="ID_null" POSITION="left" TEXT="Belgian"/>
<node ID="ID_null" POSITION="left" TEXT="aquired breweries in 20 countries"/>
<node ID="ID_null" POSITION="left" TEXT="sales in 110 countries"/>
<node ID="ID_null" POSITION="left" TEXT="local managers controlling brands"/>
<node ID="ID_null" POSITION="left" TEXT="flagship brand: Stella Artois"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="2004 merger">
<node ID="ID_null" POSITION="left" TEXT="#1 Interbrew"/>
<node ID="ID_null" POSITION="left" TEXT="#5 Am Bev - Brazil"/>
<node ID="ID_null" POSITION="left" TEXT="largest merge">
<node ID="ID_null" POSITION="left" TEXT="worth 12.8 billion"/>
</node>
</node>
<node ID="ID_null" POSITION="left" TEXT="2007">
<node ID="ID_null" POSITION="left" TEXT="inbev"/>
<node ID="ID_null" POSITION="left" TEXT="SAP Miller"/>
<node ID="ID_null" POSITION="left" TEXT="Heineken">
<node ID="ID_null" POSITION="left" TEXT="produces beer domestically">
<node ID="ID_null" POSITION="left" TEXT="parent of local distributors">
<node ID="ID_null" POSITION="left" TEXT="marketing"/>
<node ID="ID_null" POSITION="left" TEXT="importing">
<node ID="ID_null" POSITION="left" TEXT="import taxes passed on to consumer"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="produces beer domestically">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="parent of local distributors">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="distribution"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="importing">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="import taxes passed on to consumer"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="distribution"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="marketing"/>
</node>
</node>
<node ID="ID_null" POSITION="left" TEXT="marketing">
<node ID="ID_null" POSITION="left" TEXT="premium beer"/>
<node ID="ID_null" POSITION="left" TEXT="premium brand"/>
<node ID="ID_null" POSITION="left" TEXT="no mythology"/>
<node ID="ID_null" POSITION="left" TEXT="superior taste"/>
<node ID="ID_null" POSITION="left" TEXT="2006 aggressive marketing campaign">
<node ID="ID_null" POSITION="left" TEXT="Heineken Premium Light"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="SAP Miller"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="inbev"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="2004 merger">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="largest merge">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="worth 12.8 billion"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="#5 Am Bev - Brazil"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="#1 Interbrew"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Interbrew">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="flagship brand: Stella Artois"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="local managers controlling brands"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="sales in 110 countries"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="aquired breweries in 20 countries"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Belgian"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="startup costs high">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="industry supported conectration"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="90s national leaders expanded abroad"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="different countries had different tastes"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="colsolition happened in 1800s"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="no means of transport"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="many local breweries"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="traditionally a clustered market"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Carloz Fernandez CEO">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Expanding production ">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="300 million investment"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="renovate facility in Zacatecas"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="vision: top five brewers">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="top 10 beer producers in world">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Corona Extra">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Since 1997 #1 import in US">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="outsold competitor by 50%"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="56% shar of domestic market"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="worlds fourth best selling beer"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="reputation of top selling beer in world"/>
<node ID="ID_null" POSITION="left" TEXT="Dutch"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="2005">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="export sales 30%"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="4% increase domestically"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="12.3 % exports"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="7.8 % sales growth compounded over ten years"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="Anh Bush">
<node ID="ID_null" POSITION="left" TEXT="produces in foreign markets"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="International Business model">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Capitalize on NAFTA"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Growing international demand"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="experienced local distributors"/>
</node>
</node>
<node ID="ID_null" POSITION="left" TEXT="Beer Marketing">
<node ID="ID_null" POSITION="left" TEXT="People drink marketing"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="Future">
<node ID="ID_null" POSITION="left" TEXT="domestic and foreign threats"/>
<node ID="ID_null" POSITION="left" TEXT="other merger talks"/>
<node ID="ID_null" POSITION="left" TEXT="Inbev in talks with Anh Bush">
<node ID="ID_null" POSITION="left" TEXT="Two biggest companies will create huge company"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="CEO Since 1997">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="29 years old">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="working there since 13"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="Sales were decreasing due to competitive media budgets"/>
</node>
</node>
<node ID="ID_null" POSITION="right" TEXT="Mexico Industry">
<node ID="ID_null" POSITION="left" TEXT="has most trade agreements in world"/>
<node ID="ID_null" POSITION="left" TEXT="one of the largest domestic beer markets"/>
<node ID="ID_null" POSITION="left" TEXT="imported beer only 1% sales">
<node ID="ID_null" POSITION="left" TEXT="half were anh bcsh dist by modelo"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Modelo in world">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="One of top 10 breweries in world"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Fifth largest distributor in world">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="in 12 years"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Can they sustain that trend"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="modelo">
<node ID="ID_null" POSITION="left" TEXT="NAFTA S.A. An Bucsh"/>
<node ID="ID_null" POSITION="left" TEXT="62.8% of market"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="FEMSA">
<node ID="ID_null" POSITION="left" TEXT="domestic market">
<node ID="ID_null" POSITION="left" TEXT="37% of domestic market"/>
<node ID="ID_null" POSITION="left" TEXT="production and distribution in Mexico: peso not a threat"/>
<node ID="ID_null" POSITION="left" TEXT="Owns Oxxo C">
<node ID="ID_null" POSITION="left" TEXT="CA largest chain of conv stores"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="International market protected Modelo from unstable peso"/>
</node>
<node ID="ID_null" POSITION="right" STYLE="fork" TEXT="Mexico Industry">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="FEMSA">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="foriegn market">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Recently partnered with Heiniken for US market">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="2005 18.7% growth"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="leads domestic premium beer market"/>
<node ID="ID_null" POSITION="left" TEXT="997 to 2004 taking domestic market share"/>
<node ID="ID_null" POSITION="left" TEXT="NAFTA SACoca cola">
<node ID="ID_null" POSITION="left" TEXT="Exclusive distributor"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="90s entry to us market failed"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Partnership Heiniken">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Distribution in US"/>
</node>
</node>
<node ID="ID_null" POSITION="left" TEXT="foriegn market">
<node ID="ID_null" POSITION="left" TEXT="Partnership Heiniken">
<node ID="ID_null" POSITION="left" TEXT="Distribution in US"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="domestic market">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="NAFTA SACoca cola">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Exclusive distributor"/>
</node>
<node ID="ID_null" POSITION="left" TEXT="90s entry to us market failed"/>
<node ID="ID_null" POSITION="left" TEXT="Recently partnered with Heiniken for US market">
<node ID="ID_null" POSITION="left" TEXT="2005 18.7% growth"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="997 to 2004 taking domestic market share"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="leads domestic premium beer market"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Owns Oxxo C">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="CA largest chain of conv stores"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="production and distribution in Mexico: peso not a threat"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="37% of domestic market"/>
</node>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="modelo">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="62.8% of market"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="NAFTA S.A. An Bucsh"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="imported beer only 1% sales">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="half were anh bcsh dist by modelo"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="one of the largest domestic beer markets"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="has most trade agreements in world"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Modelo in Mexico">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Largest Beer producer and distrubutor in Mexico">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="corona 56% share"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="1971, Antonino Fernandez was appointed CEO">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Anheuser-Busch 17.7 % of the equity">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="The 50.2 % represented 43.9% voting"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Mexican Stock exchange in 1994"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="History to 1970">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="bought the brands and assets of the Toluca y Mexico Brewery">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="country's oldest brand of beer"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="1935"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="1940s period of strong growth ">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="improve distribution methods and produc&#172;tion facilities ">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="distribution: direct with profit sharing"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="concentrate domesti&#172;cally "/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Corona 2nd Brand">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Clear Glass Customers preference"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Modelo 1st Brand"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="focus on Mexico City"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="formed in 1922">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Fernandez Family Sole owner since 1936"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Diez sole owner 1936"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Iriarte died in 1932"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr"/>
</node>
</node>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="US Beer Market">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="volume main driver"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="dense network of regional craft brewing"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="80% of market">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Miller"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="adolf coors"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="AB">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="75% of industry profits"/>
</node>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Groth expectations reduced"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Consumption six times higher per cap"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="2nd largest nest to China"/>
</node>
<node ID="ID_null" POSITION="right" STYLE="fork" TEXT="Modelo in US">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Us dist contracts">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Gambrinus">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="eastern dist"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="1986"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Chicago based Barton Beers 1st">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="largest importer in 25 western states"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="production in Mexico"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Modelo had final say on brand image"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="procermex inc">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Coordinate"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Supervise"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Support"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Modelo us subsidiary"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="importer/distributors">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="advertixing"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="customs"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="pricing"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="insurance"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="transportation"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="competitive relationship"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Autonomous"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Local Companies"/>
</node>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Marketing">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="1996ad budget">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="an bsch 192 mil"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Heiniken 15 mil"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Corona 5.1 mil"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Fun in the sun">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="relaxation"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="escape"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Barton Beer's idea"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="dependable second choise"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="beer for non beer drinkers"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="found new following"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="not testosterone driven"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="not selling premium quality"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="surfing mythology"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="2007 5 beers to us">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="131 million cases"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Heineken">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Main Import Comptitor"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="3 of top 8 beers in US"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="History">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="1991">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="distributors took the loss"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="doubling of federal excise tax on beer">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="distributor absorb the tax 92"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="sales decrease of 15 percent"/>
</node>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="rapid growth 1980s">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="second most popular imported beer"/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="gained popularity in southern states"/>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="Amalgamated Distillery Products Inc. (">
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="later renamed Barton Beers Ltd."/>
</node>
<node ID="ID_null" POSITION="left" STYLE="fork" TEXT="1979"/>
</node>
</node>
</node>

File diff suppressed because one or more lines are too long

View File

@ -79,198 +79,198 @@
<text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
</text:sequence-decls>
<text:p text:style-name="Title">corona</text:p>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Modelo in world</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">International market protected Modelo from unstable peso</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Fifth largest distributor in world</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Can they sustain that trend</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">in 12 years</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">One of top 10 breweries in world</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">The Beer market</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Future</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Sales were decreasing due to competitive media budgets</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Inbev in talks with Anh Bush</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Two biggest companies will create huge company</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">other merger talks</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">domestic and foreign threats</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Beer Marketing</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">People drink marketing</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">2007</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Anh Bush</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">produces in foreign markets</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Heineken</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Dutch</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">reputation of top selling beer in world</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">marketing</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">2006 aggressive marketing campaign</text:h>
<text:h text:style-name="Heading_20_6" text:outline-level="6">Heineken Premium Light</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">superior taste</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">no mythology</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">premium brand</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">premium beer</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">produces beer domestically</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">parent of local distributors</text:h>
<text:h text:style-name="Heading_20_6" text:outline-level="6">distribution</text:h>
<text:h text:style-name="Heading_20_6" text:outline-level="6">importing</text:h>
<text:h text:style-name="Heading_20_7" text:outline-level="7">import taxes passed on to consumer</text:h>
<text:h text:style-name="Heading_20_6" text:outline-level="6">marketing</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">SAP Miller</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">inbev</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">2004 merger</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">largest merge</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">worth 12.8 billion</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">#5 Am Bev - Brazil</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">#1 Interbrew</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Interbrew</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">flagship brand: Stella Artois</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">local managers controlling brands</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">sales in 110 countries</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">aquired breweries in 20 countries</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Belgian</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">startup costs high</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">industry supported conectration</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">90s national leaders expanded abroad</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">different countries had different tastes</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">colsolition happened in 1800s</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">no means of transport</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">many local breweries</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">traditionally a clustered market</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Carloz Fernandez CEO</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Expanding production </text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">300 million investment</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">renovate facility in Zacatecas</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">vision: top five brewers</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">top 10 beer producers in world</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Corona Extra</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">Since 1997 #1 import in US</text:h>
<text:h text:style-name="Heading_20_6" text:outline-level="6">outsold competitor by 50%</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">56% shar of domestic market</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">worlds fourth best selling beer</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">2005</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">export sales 30%</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">4% increase domestically</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">12.3 % exports</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">7.8 % sales growth compounded over ten years</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">International Business model</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Capitalize on NAFTA</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Growing international demand</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">experienced local distributors</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">CEO Since 1997</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">29 years old</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">working there since 13</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">vision: top five brewers</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">International Business model</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">experienced local distributors</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Growing international demand</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Capitalize on NAFTA</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">top 10 beer producers in world</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">7.8 % sales growth compounded over ten years</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">2005</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">12.3 % exports</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">4% increase domestically</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">export sales 30%</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Corona Extra</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">worlds fourth best selling beer</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">56% shar of domestic market</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">Since 1997 #1 import in US</text:h>
<text:h text:style-name="Heading_20_6" text:outline-level="6">outsold competitor by 50%</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Expanding production </text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">renovate facility in Zacatecas</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">300 million investment</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">US Beer Market</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">2nd largest nest to China</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Consumption six times higher per cap</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Groth expectations reduced</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">80% of market</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">AB</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">75% of industry profits</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">adolf coors</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Miller</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">dense network of regional craft brewing</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">volume main driver</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Modelo in Mexico</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">History to 1970</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">formed in 1922</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Iriarte died in 1932</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Diez sole owner 1936</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Fernandez Family Sole owner since 1936</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">focus on Mexico City</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Modelo 1st Brand</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Corona 2nd Brand</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Clear Glass Customers preference</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">1940s period of strong growth </text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">concentrate domesti¬cally </text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">improve distribution methods and produc¬tion facilities </text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">distribution: direct with profit sharing</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">bought the brands and assets of the Toluca y Mexico Brewery</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">1935</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">country's oldest brand of beer</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">1971, Antonino Fernandez was appointed CEO</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Mexican Stock exchange in 1994</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Anheuser-Busch 17.7 % of the equity</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">The 50.2 % represented 43.9% voting</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Largest Beer producer and distrubutor in Mexico</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">corona 56% share</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Modelo in US</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">History</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">1979</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Amalgamated Distillery Products Inc. (</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">later renamed Barton Beers Ltd.</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">gained popularity in southern states</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">rapid growth 1980s</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">second most popular imported beer</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">1991</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">doubling of federal excise tax on beer</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">sales decrease of 15 percent</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">distributor absorb the tax 92</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">distributors took the loss</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">2007 5 beers to us</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">3 of top 8 beers in US</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Heineken</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Main Import Comptitor</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">131 million cases</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Marketing</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">surfing mythology</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">not selling premium quality</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">not testosterone driven</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">found new following</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">beer for non beer drinkers</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">dependable second choise</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Fun in the sun</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Barton Beer's idea</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">escape</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">relaxation</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">1996ad budget</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Corona 5.1 mil</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Heiniken 15 mil</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">an bsch 192 mil</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Us dist contracts</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">importer/distributors</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Local Companies</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Autonomous</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">competitive relationship</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">transportation</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">insurance</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">pricing</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">customs</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">advertixing</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">procermex inc</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Modelo us subsidiary</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Support</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Supervise</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Coordinate</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Modelo had final say on brand image</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">production in Mexico</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Chicago based Barton Beers 1st</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">largest importer in 25 western states</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Gambrinus</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">1986</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">eastern dist</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">The Beer market</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">traditionally a clustered market</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">many local breweries</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">no means of transport</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">colsolition happened in 1800s</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">different countries had different tastes</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">90s national leaders expanded abroad</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">startup costs high</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">industry supported conectration</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Interbrew</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Belgian</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">aquired breweries in 20 countries</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">sales in 110 countries</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">local managers controlling brands</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">flagship brand: Stella Artois</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">2004 merger</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">#1 Interbrew</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">#5 Am Bev - Brazil</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">largest merge</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">worth 12.8 billion</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">2007</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">inbev</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">SAP Miller</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Heineken</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">produces beer domestically</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">parent of local distributors</text:h>
<text:h text:style-name="Heading_20_6" text:outline-level="6">marketing</text:h>
<text:h text:style-name="Heading_20_6" text:outline-level="6">importing</text:h>
<text:h text:style-name="Heading_20_7" text:outline-level="7">import taxes passed on to consumer</text:h>
<text:h text:style-name="Heading_20_6" text:outline-level="6">distribution</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">marketing</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">premium beer</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">premium brand</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">no mythology</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">superior taste</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">2006 aggressive marketing campaign</text:h>
<text:h text:style-name="Heading_20_6" text:outline-level="6">Heineken Premium Light</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">reputation of top selling beer in world</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Dutch</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Anh Bush</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">produces in foreign markets</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Beer Marketing</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">People drink marketing</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Future</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">domestic and foreign threats</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">other merger talks</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Inbev in talks with Anh Bush</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Two biggest companies will create huge company</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Sales were decreasing due to competitive media budgets</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Modelo in world</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">One of top 10 breweries in world</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Fifth largest distributor in world</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">in 12 years</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Can they sustain that trend</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">International market protected Modelo from unstable peso</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Mexico Industry</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">has most trade agreements in world</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">one of the largest domestic beer markets</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">imported beer only 1% sales</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">half were anh bcsh dist by modelo</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">modelo</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">NAFTA S.A. An Bucsh</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">62.8% of market</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">FEMSA</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">domestic market</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">37% of domestic market</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">production and distribution in Mexico: peso not a threat</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Owns Oxxo C</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">CA largest chain of conv stores</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">leads domestic premium beer market</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">997 to 2004 taking domestic market share</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">NAFTA SACoca cola</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">Exclusive distributor</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">foriegn market</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Partnership Heiniken</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">Distribution in US</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">90s entry to us market failed</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Recently partnered with Heiniken for US market</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">2005 18.7% growth</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">90s entry to us market failed</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Partnership Heiniken</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">Distribution in US</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">domestic market</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">NAFTA SACoca cola</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">Exclusive distributor</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">997 to 2004 taking domestic market share</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">leads domestic premium beer market</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Owns Oxxo C</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">CA largest chain of conv stores</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">production and distribution in Mexico: peso not a threat</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">37% of domestic market</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">modelo</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">62.8% of market</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">NAFTA S.A. An Bucsh</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">imported beer only 1% sales</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">half were anh bcsh dist by modelo</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">one of the largest domestic beer markets</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">has most trade agreements in world</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Modelo in Mexico</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Largest Beer producer and distrubutor in Mexico</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">corona 56% share</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">1971, Antonino Fernandez was appointed CEO</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Anheuser-Busch 17.7 % of the equity</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">The 50.2 % represented 43.9% voting</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Mexican Stock exchange in 1994</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">History to 1970</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">bought the brands and assets of the Toluca y Mexico Brewery</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">country's oldest brand of beer</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">1935</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">1940s period of strong growth </text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">improve distribution methods and produc¬tion facilities </text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">distribution: direct with profit sharing</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">concentrate domesti¬cally </text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Corona 2nd Brand</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Clear Glass Customers preference</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Modelo 1st Brand</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">focus on Mexico City</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">formed in 1922</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Fernandez Family Sole owner since 1936</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Diez sole owner 1936</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Iriarte died in 1932</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">US Beer Market</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">volume main driver</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">dense network of regional craft brewing</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">80% of market</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Miller</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">adolf coors</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">AB</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">75% of industry profits</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Groth expectations reduced</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Consumption six times higher per cap</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">2nd largest nest to China</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Modelo in US</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Us dist contracts</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Gambrinus</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">eastern dist</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">1986</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Chicago based Barton Beers 1st</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">largest importer in 25 western states</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">production in Mexico</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Modelo had final say on brand image</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">procermex inc</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Coordinate</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Supervise</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Support</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Modelo us subsidiary</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">importer/distributors</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">advertixing</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">customs</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">pricing</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">insurance</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">transportation</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">competitive relationship</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Autonomous</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Local Companies</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Marketing</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">1996ad budget</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">an bsch 192 mil</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Heiniken 15 mil</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Corona 5.1 mil</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Fun in the sun</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">relaxation</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">escape</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Barton Beer's idea</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">dependable second choise</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">beer for non beer drinkers</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">found new following</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">not testosterone driven</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">not selling premium quality</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">surfing mythology</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">2007 5 beers to us</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">131 million cases</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Heineken</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">Main Import Comptitor</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">3 of top 8 beers in US</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">History</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">1991</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">distributors took the loss</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">doubling of federal excise tax on beer</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">distributor absorb the tax 92</text:h>
<text:h text:style-name="Heading_20_5" text:outline-level="5">sales decrease of 15 percent</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">rapid growth 1980s</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">second most popular imported beer</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">gained popularity in southern states</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Amalgamated Distillery Products Inc. (</text:h>
<text:h text:style-name="Heading_20_4" text:outline-level="4">later renamed Barton Beers Ltd.</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">1979</text:h>
</office:text>
</office:body>
</office:document-content>

View File

@ -1,193 +1,193 @@
1 corona
1.1 Modelo in world
1.1.1 International market protected Modelo from unstable peso
1.1.2 Fifth largest distributor in world
1.1.2.1 Can they sustain that trend
1.1.2.2 in 12 years
1.1.3 One of top 10 breweries in world
1.1 The Beer market
1.1.1 Future
1.1.1.1 Sales were decreasing due to competitive media budgets
1.1.1.2 Inbev in talks with Anh Bush
1.1.1.2.1 Two biggest companies will create huge company
1.1.1.3 other merger talks
1.1.1.4 domestic and foreign threats
1.1.2 Beer Marketing
1.1.2.1 People drink marketing
1.1.3 2007
1.1.3.1 Anh Bush
1.1.3.1.1 produces in foreign markets
1.1.3.2 Heineken
1.1.3.2.1 Dutch
1.1.3.2.2 reputation of top selling beer in world
1.1.3.2.3 marketing
1.1.3.2.3.1 2006 aggressive marketing campaign
1.1.3.2.3.1.1 Heineken Premium Light
1.1.3.2.3.2 superior taste
1.1.3.2.3.3 no mythology
1.1.3.2.3.4 premium brand
1.1.3.2.3.5 premium beer
1.1.3.2.4 produces beer domestically
1.1.3.2.4.1 parent of local distributors
1.1.3.2.4.1.1 distribution
1.1.3.2.4.1.2 importing
1.1.3.2.4.1.2.1 import taxes passed on to consumer
1.1.3.2.4.1.3 marketing
1.1.3.3 SAP Miller
1.1.3.4 inbev
1.1.4 2004 merger
1.1.4.1 largest merge
1.1.4.1.1 worth 12.8 billion
1.1.4.2 #5 Am Bev - Brazil
1.1.4.3 #1 Interbrew
1.1.5 Interbrew
1.1.5.1 flagship brand: Stella Artois
1.1.5.2 local managers controlling brands
1.1.5.3 sales in 110 countries
1.1.5.4 aquired breweries in 20 countries
1.1.5.5 Belgian
1.1.6 startup costs high
1.1.6.1 industry supported conectration
1.1.7 90s national leaders expanded abroad
1.1.8 different countries had different tastes
1.1.9 colsolition happened in 1800s
1.1.10 no means of transport
1.1.11 many local breweries
1.1.12 traditionally a clustered market
1.2 Carloz Fernandez CEO
1.2.1 CEO Since 1997
1.2.1.1 29 years old
1.2.1.1.1 working there since 13
1.2.1 Expanding production
1.2.1.1 300 million investment
1.2.1.2 renovate facility in Zacatecas
1.2.2 vision: top five brewers
1.2.2.1 International Business model
1.2.2.1.1 experienced local distributors
1.2.2.1.2 Growing international demand
1.2.2.1.3 Capitalize on NAFTA
1.2.2.2 top 10 beer producers in world
1.2.2.2.1 7.8 % sales growth compounded over ten years
1.2.2.2.2 2005
1.2.2.2.2.1 12.3 % exports
1.2.2.2.2.2 4% increase domestically
1.2.2.2.2.3 export sales 30%
1.2.2.2.3 Corona Extra
1.2.2.2.3.1 worlds fourth best selling beer
1.2.2.2.3.2 56% shar of domestic market
1.2.2.2.3.3 Since 1997 #1 import in US
1.2.2.2.3.3.1 outsold competitor by 50%
1.2.3 Expanding production
1.2.3.1 renovate facility in Zacatecas
1.2.3.2 300 million investment
1.3 US Beer Market
1.3.1 2nd largest nest to China
1.3.2 Consumption six times higher per cap
1.3.3 Groth expectations reduced
1.3.4 80% of market
1.3.4.1 AB
1.3.4.1.1 75% of industry profits
1.3.4.2 adolf coors
1.3.4.3 Miller
1.3.5 dense network of regional craft brewing
1.3.6 volume main driver
1.4 Modelo in Mexico
1.4.1 History to 1970
1.4.1.1 formed in 1922
1.4.1.1.1 Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr
1.4.1.1.2 Iriarte died in 1932
1.4.1.1.3 Diez sole owner 1936
1.4.1.1.4 Fernandez Family Sole owner since 1936
1.4.1.2 focus on Mexico City
1.4.1.3 Modelo 1st Brand
1.4.1.4 Corona 2nd Brand
1.4.1.4.1 Clear Glass Customers preference
1.4.1.5 1940s period of strong growth
1.4.1.5.1 concentrate domesti¬cally
1.4.1.5.2 improve distribution methods and produc¬tion facilities
1.4.1.5.2.1 distribution: direct with profit sharing
1.4.1.6 bought the brands and assets of the Toluca y Mexico Brewery
1.4.1.6.1 1935
1.4.1.6.2 country's oldest brand of beer
1.4.2 1971, Antonino Fernandez was appointed CEO
1.4.2.1 Mexican Stock exchange in 1994
1.4.2.2 Anheuser-Busch 17.7 % of the equity
1.4.2.2.1 The 50.2 % represented 43.9% voting
1.4.3 Largest Beer producer and distrubutor in Mexico
1.4.3.1 corona 56% share
1.5 Modelo in US
1.5.1 History
1.5.1.1 1979
1.5.1.2 Amalgamated Distillery Products Inc. (
1.5.1.2.1 later renamed Barton Beers Ltd.
1.5.1.3 gained popularity in southern states
1.5.1.4 rapid growth 1980s
1.5.1.4.1 second most popular imported beer
1.5.1.5 1991
1.5.1.5.1 doubling of federal excise tax on beer
1.5.1.5.1.1 sales decrease of 15 percent
1.5.1.5.1.2 distributor absorb the tax 92
1.5.1.5.2 distributors took the loss
1.5.2 2007 5 beers to us
1.5.2.1 3 of top 8 beers in US
1.5.2.2 Heineken
1.5.2.2.1 Main Import Comptitor
1.5.2.3 131 million cases
1.5.3 Marketing
1.5.3.1 surfing mythology
1.5.3.2 not selling premium quality
1.5.3.3 not testosterone driven
1.5.3.4 found new following
1.5.3.5 beer for non beer drinkers
1.5.3.6 dependable second choise
1.5.3.7 Fun in the sun
1.5.3.7.1 Barton Beer's idea
1.5.3.7.2 escape
1.5.3.7.3 relaxation
1.5.3.8 1996ad budget
1.5.3.8.1 Corona 5.1 mil
1.5.3.8.2 Heiniken 15 mil
1.5.3.8.3 an bsch 192 mil
1.5.4 Us dist contracts
1.5.4.1 importer/distributors
1.5.4.1.1 Local Companies
1.5.4.1.2 Autonomous
1.5.4.1.3 competitive relationship
1.5.4.1.4 transportation
1.5.4.1.5 insurance
1.5.4.1.6 pricing
1.5.4.1.7 customs
1.5.4.1.8 advertixing
1.5.4.2 procermex inc
1.5.4.2.1 Modelo us subsidiary
1.5.4.2.2 Support
1.5.4.2.3 Supervise
1.5.4.2.4 Coordinate
1.5.4.3 Modelo had final say on brand image
1.5.4.4 production in Mexico
1.5.4.5 Chicago based Barton Beers 1st
1.5.4.5.1 largest importer in 25 western states
1.5.4.6 Gambrinus
1.5.4.6.1 1986
1.5.4.6.2 eastern dist
1.6 The Beer market
1.6.1 traditionally a clustered market
1.6.2 many local breweries
1.6.3 no means of transport
1.6.4 colsolition happened in 1800s
1.6.5 different countries had different tastes
1.6.6 90s national leaders expanded abroad
1.6.7 startup costs high
1.6.7.1 industry supported conectration
1.6.8 Interbrew
1.6.8.1 Belgian
1.6.8.2 aquired breweries in 20 countries
1.6.8.3 sales in 110 countries
1.6.8.4 local managers controlling brands
1.6.8.5 flagship brand: Stella Artois
1.6.9 2004 merger
1.6.9.1 #1 Interbrew
1.6.9.2 #5 Am Bev - Brazil
1.6.9.3 largest merge
1.6.9.3.1 worth 12.8 billion
1.6.10 2007
1.6.10.1 inbev
1.6.10.2 SAP Miller
1.6.10.3 Heineken
1.6.10.3.1 produces beer domestically
1.6.10.3.1.1 parent of local distributors
1.6.10.3.1.1.1 marketing
1.6.10.3.1.1.2 importing
1.6.10.3.1.1.2.1 import taxes passed on to consumer
1.6.10.3.1.1.3 distribution
1.6.10.3.2 marketing
1.6.10.3.2.1 premium beer
1.6.10.3.2.2 premium brand
1.6.10.3.2.3 no mythology
1.6.10.3.2.4 superior taste
1.6.10.3.2.5 2006 aggressive marketing campaign
1.6.10.3.2.5.1 Heineken Premium Light
1.6.10.3.3 reputation of top selling beer in world
1.6.10.3.4 Dutch
1.6.10.4 Anh Bush
1.6.10.4.1 produces in foreign markets
1.6.11 Beer Marketing
1.6.11.1 People drink marketing
1.6.12 Future
1.6.12.1 domestic and foreign threats
1.6.12.2 other merger talks
1.6.12.3 Inbev in talks with Anh Bush
1.6.12.3.1 Two biggest companies will create huge company
1.6.12.4 Sales were decreasing due to competitive media budgets
1.7 Mexico Industry
1.7.1 has most trade agreements in world
1.7.2 one of the largest domestic beer markets
1.7.3 imported beer only 1% sales
1.7.3.1 half were anh bcsh dist by modelo
1.7.4 modelo
1.7.4.1 NAFTA S.A. An Bucsh
1.7.4.2 62.8% of market
1.7.5 FEMSA
1.7.5.1 domestic market
1.7.5.1.1 37% of domestic market
1.7.5.1.2 production and distribution in Mexico: peso not a threat
1.7.5.1.3 Owns Oxxo C
1.7.5.1.3.1 CA largest chain of conv stores
1.7.5.1.4 leads domestic premium beer market
1.7.5.1.5 997 to 2004 taking domestic market share
1.7.5.1.6 NAFTA SACoca cola
1.7.5.1.6.1 Exclusive distributor
1.7.5.2 foriegn market
1.7.5.2.1 Partnership Heiniken
1.7.5.2.1.1 Distribution in US
1.7.5.2.2 90s entry to us market failed
1.7.5.2.3 Recently partnered with Heiniken for US market
1.7.5.2.3.1 2005 18.7% growth
1.2.2.1 top 10 beer producers in world
1.2.2.1.1 Corona Extra
1.2.2.1.1.1 Since 1997 #1 import in US
1.2.2.1.1.1.1 outsold competitor by 50%
1.2.2.1.1.2 56% shar of domestic market
1.2.2.1.1.3 worlds fourth best selling beer
1.2.2.1.2 2005
1.2.2.1.2.1 export sales 30%
1.2.2.1.2.2 4% increase domestically
1.2.2.1.2.3 12.3 % exports
1.2.2.1.3 7.8 % sales growth compounded over ten years
1.2.2.2 International Business model
1.2.2.2.1 Capitalize on NAFTA
1.2.2.2.2 Growing international demand
1.2.2.2.3 experienced local distributors
1.2.3 CEO Since 1997
1.2.3.1 29 years old
1.2.3.1.1 working there since 13
1.3 Modelo in world
1.3.1 One of top 10 breweries in world
1.3.2 Fifth largest distributor in world
1.3.2.1 in 12 years
1.3.2.2 Can they sustain that trend
1.3.3 International market protected Modelo from unstable peso
1.4 Mexico Industry
1.4.1 FEMSA
1.4.1.1 foriegn market
1.4.1.1.1 Recently partnered with Heiniken for US market
1.4.1.1.1.1 2005 18.7% growth
1.4.1.1.2 90s entry to us market failed
1.4.1.1.3 Partnership Heiniken
1.4.1.1.3.1 Distribution in US
1.4.1.2 domestic market
1.4.1.2.1 NAFTA SACoca cola
1.4.1.2.1.1 Exclusive distributor
1.4.1.2.2 997 to 2004 taking domestic market share
1.4.1.2.3 leads domestic premium beer market
1.4.1.2.4 Owns Oxxo C
1.4.1.2.4.1 CA largest chain of conv stores
1.4.1.2.5 production and distribution in Mexico: peso not a threat
1.4.1.2.6 37% of domestic market
1.4.2 modelo
1.4.2.1 62.8% of market
1.4.2.2 NAFTA S.A. An Bucsh
1.4.3 imported beer only 1% sales
1.4.3.1 half were anh bcsh dist by modelo
1.4.4 one of the largest domestic beer markets
1.4.5 has most trade agreements in world
1.5 Modelo in Mexico
1.5.1 Largest Beer producer and distrubutor in Mexico
1.5.1.1 corona 56% share
1.5.2 1971, Antonino Fernandez was appointed CEO
1.5.2.1 Anheuser-Busch 17.7 % of the equity
1.5.2.1.1 The 50.2 % represented 43.9% voting
1.5.2.2 Mexican Stock exchange in 1994
1.5.3 History to 1970
1.5.3.1 bought the brands and assets of the Toluca y Mexico Brewery
1.5.3.1.1 country's oldest brand of beer
1.5.3.1.2 1935
1.5.3.2 1940s period of strong growth
1.5.3.2.1 improve distribution methods and produc¬tion facilities
1.5.3.2.1.1 distribution: direct with profit sharing
1.5.3.2.2 concentrate domesti¬cally
1.5.3.3 Corona 2nd Brand
1.5.3.3.1 Clear Glass Customers preference
1.5.3.4 Modelo 1st Brand
1.5.3.5 focus on Mexico City
1.5.3.6 formed in 1922
1.5.3.6.1 Fernandez Family Sole owner since 1936
1.5.3.6.2 Diez sole owner 1936
1.5.3.6.3 Iriarte died in 1932
1.5.3.6.4 Pablo Diez Fernandez, Braulio Irare, Marin Oyamburr
1.6 US Beer Market
1.6.1 volume main driver
1.6.2 dense network of regional craft brewing
1.6.3 80% of market
1.6.3.1 Miller
1.6.3.2 adolf coors
1.6.3.3 AB
1.6.3.3.1 75% of industry profits
1.6.4 Groth expectations reduced
1.6.5 Consumption six times higher per cap
1.6.6 2nd largest nest to China
1.7 Modelo in US
1.7.1 Us dist contracts
1.7.1.1 Gambrinus
1.7.1.1.1 eastern dist
1.7.1.1.2 1986
1.7.1.2 Chicago based Barton Beers 1st
1.7.1.2.1 largest importer in 25 western states
1.7.1.3 production in Mexico
1.7.1.4 Modelo had final say on brand image
1.7.1.5 procermex inc
1.7.1.5.1 Coordinate
1.7.1.5.2 Supervise
1.7.1.5.3 Support
1.7.1.5.4 Modelo us subsidiary
1.7.1.6 importer/distributors
1.7.1.6.1 advertixing
1.7.1.6.2 customs
1.7.1.6.3 pricing
1.7.1.6.4 insurance
1.7.1.6.5 transportation
1.7.1.6.6 competitive relationship
1.7.1.6.7 Autonomous
1.7.1.6.8 Local Companies
1.7.2 Marketing
1.7.2.1 1996ad budget
1.7.2.1.1 an bsch 192 mil
1.7.2.1.2 Heiniken 15 mil
1.7.2.1.3 Corona 5.1 mil
1.7.2.2 Fun in the sun
1.7.2.2.1 relaxation
1.7.2.2.2 escape
1.7.2.2.3 Barton Beer's idea
1.7.2.3 dependable second choise
1.7.2.4 beer for non beer drinkers
1.7.2.5 found new following
1.7.2.6 not testosterone driven
1.7.2.7 not selling premium quality
1.7.2.8 surfing mythology
1.7.3 2007 5 beers to us
1.7.3.1 131 million cases
1.7.3.2 Heineken
1.7.3.2.1 Main Import Comptitor
1.7.3.3 3 of top 8 beers in US
1.7.4 History
1.7.4.1 1991
1.7.4.1.1 distributors took the loss
1.7.4.1.2 doubling of federal excise tax on beer
1.7.4.1.2.1 distributor absorb the tax 92
1.7.4.1.2.2 sales decrease of 15 percent
1.7.4.2 rapid growth 1980s
1.7.4.2.1 second most popular imported beer
1.7.4.3 gained popularity in southern states
1.7.4.4 Amalgamated Distillery Products Inc. (
1.7.4.4.1 later renamed Barton Beers Ltd.
1.7.4.5 1979

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,45 @@
SaberMás
,
Complementamos el trabajo de la escuela
,
,
SaberMás trabaja con, desde y para la motivación
,
,
Trabajamos en equipo en nuestros proyectos
,
,
Cada uno va a su ritmo, y cada cual pone sus límites
,
,
Aprendemos todos de todos
,
,
Valoramos lo que hemos aprendido
,
Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas
,
Trabajo basado en la experimentación y en la investigación
,
Alternativa a otras actividades de ocio
,
Actividades centradas en el contexto cercano
,
Duración limitada: 5-6 semanas
,
Utilización de medios de expresión artística, digitales y analógicos
,
Precio también limitado: 100-120?
,
Uso de la tecnología durante todo el proceso de aprendizaje
,
Niños y niñas que quieren saber más
,
Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?)
,
De 8 a 12 años, sin separación por edades
,
Máximo 10/1 por taller
,
Talleres temáticos
,
@ -15,9 +52,19 @@ SaberMás
,
,
Arqueología
,
,
Culturas Antiguas
,
,
,
Egipto, Grecia, China...
,
,
Energía
,
,
Paleontología
,
,
Astronomía
@ -30,50 +77,3 @@ SaberMás
,
,
Poesía
,
,
Culturas Antiguas
,
,
,
Egipto, Grecia, China...
,
,
Paleontología
,
Duración limitada: 5-6 semanas
,
Niños y niñas que quieren saber más
,
Alternativa a otras actividades de ocio
,
Uso de la tecnología durante todo el proceso de aprendizaje
,
Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas
,
Trabajo basado en la experimentación y en la investigación
,
De 8 a 12 años, sin separación por edades
,
Máximo 10/1 por taller
,
Actividades centradas en el contexto cercano
,
Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?)
,
Complementamos el trabajo de la escuela
,
,
Cada uno va a su ritmo, y cada cual pone sus límites
,
,
Aprendemos todos de todos
,
,
Valoramos lo que hemos aprendido
,
,
SaberMás trabaja con, desde y para la motivación
,
,
Trabajamos en equipo en nuestros proyectos

1 SaberMás
2 ,
3 Complementamos el trabajo de la escuela
4 ,
5 ,
6 SaberMás trabaja con, desde y para la motivación
7 ,
8 ,
9 Trabajamos en equipo en nuestros proyectos
10 ,
11 ,
12 Cada uno va a su ritmo, y cada cual pone sus límites
13 ,
14 ,
15 Aprendemos todos de todos
16 ,
17 ,
18 Valoramos lo que hemos aprendido
19 ,
20 Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas
21 ,
22 Trabajo basado en la experimentación y en la investigación
23 ,
24 Alternativa a otras actividades de ocio
25 ,
26 Actividades centradas en el contexto cercano
27 ,
28 Duración limitada: 5-6 semanas
29 ,
30 Utilización de medios de expresión artística, digitales y analógicos
31 ,
32 Precio también limitado: 100-120?
33 ,
34 Uso de la tecnología durante todo el proceso de aprendizaje
35 ,
36 Niños y niñas que quieren saber más
37 ,
38 Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?)
39 ,
40 De 8 a 12 años, sin separación por edades
41 ,
42 Máximo 10/1 por taller
43 ,
44 Talleres temáticos
45 ,
52 ,
53 ,
54 Arqueología
55 ,
56 ,
57 Culturas Antiguas
58 ,
59 ,
60 ,
61 Egipto, Grecia, China...
62 ,
63 ,
64 Energía
65 ,
66 ,
67 Paleontología
68 ,
69 ,
70 Astronomía
77 ,
78 ,
79 Poesía
,
,
Culturas Antiguas
,
,
,
Egipto, Grecia, China...
,
,
Paleontología
,
Duración limitada: 5-6 semanas
,
Niños y niñas que quieren saber más
,
Alternativa a otras actividades de ocio
,
Uso de la tecnología durante todo el proceso de aprendizaje
,
Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas
,
Trabajo basado en la experimentación y en la investigación
,
De 8 a 12 años, sin separación por edades
,
Máximo 10/1 por taller
,
Actividades centradas en el contexto cercano
,
Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?)
,
Complementamos el trabajo de la escuela
,
,
Cada uno va a su ritmo, y cada cual pone sus límites
,
,
Aprendemos todos de todos
,
,
Valoramos lo que hemos aprendido
,
,
SaberMás trabaja con, desde y para la motivación
,
,
Trabajamos en equipo en nuestros proyectos

View File

@ -267,6 +267,131 @@
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Complementamos el trabajo de la escuela</w:t>
</w:r>
</w:p>
<w:p>
<w:pPr>
<w:pStyle w:val="BodyText"/>
</w:pPr>
<w:r>
<w:t>
Todos los contenidos de los talleres están relacionados con el currículo de la enseñanza básica.
A diferencia de la práctica tradicional, pretendemos ahondar en el conocimiento partiendo de lo que realmente interesa al niño o niña,
ayudándole a que encuentre respuesta a las preguntas que él o ella se plantea.
Por ese motivo, SaberMás proyecta estar al lado de los niños que necesitan una motivación extra para entender la escuela y fluir en ella,
y también al lado de aquellos a quienes la curiosidad y las ganas de saber les lleva más allá.
</w:t>
</w:r>
</w:p>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>SaberMás trabaja con, desde y para la motivación</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Trabajamos en equipo en nuestros proyectos</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Cada uno va a su ritmo, y cada cual pone sus límites</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Aprendemos todos de todos</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Valoramos lo que hemos aprendido</w:t>
</w:r>
</w:p>
</wx:sub-section>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Trabajo basado en la experimentación y en la investigación</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Alternativa a otras actividades de ocio</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Actividades centradas en el contexto cercano</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Duración limitada: 5-6 semanas</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Utilización de medios de expresión artística, digitales y analógicos</w:t>
</w:r>
</w:p>
@ -287,6 +412,56 @@
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Uso de la tecnología durante todo el proceso de aprendizaje</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Niños y niñas que quieren saber más</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?)</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>De 8 a 12 años, sin separación por edades</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Máximo 10/1 por taller</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Talleres temáticos</w:t>
</w:r>
</w:p>
@ -326,6 +501,26 @@
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Culturas Antiguas</w:t>
</w:r>
</w:p>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading3"/>
</w:pPr>
<w:r>
<w:t>Egipto, Grecia, China...</w:t>
</w:r>
</w:p>
</wx:sub-section>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Energía</w:t>
</w:r>
</w:p>
@ -336,6 +531,16 @@
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Paleontología</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Astronomía</w:t>
</w:r>
</w:p>
@ -370,211 +575,6 @@
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Culturas Antiguas</w:t>
</w:r>
</w:p>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading3"/>
</w:pPr>
<w:r>
<w:t>Egipto, Grecia, China...</w:t>
</w:r>
</w:p>
</wx:sub-section>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Paleontología</w:t>
</w:r>
</w:p>
</wx:sub-section>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Duración limitada: 5-6 semanas</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Niños y niñas que quieren saber más</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Alternativa a otras actividades de ocio</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Uso de la tecnología durante todo el proceso de aprendizaje</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Trabajo basado en la experimentación y en la investigación</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>De 8 a 12 años, sin separación por edades</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Máximo 10/1 por taller</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Actividades centradas en el contexto cercano</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?)</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Complementamos el trabajo de la escuela</w:t>
</w:r>
</w:p>
<w:p>
<w:pPr>
<w:pStyle w:val="BodyText"/>
</w:pPr>
<w:r>
<w:t>
Todos los contenidos de los talleres están relacionados con el currículo de la enseñanza básica.
A diferencia de la práctica tradicional, pretendemos ahondar en el conocimiento partiendo de lo que realmente interesa al niño o niña,
ayudándole a que encuentre respuesta a las preguntas que él o ella se plantea.
Por ese motivo, SaberMás proyecta estar al lado de los niños que necesitan una motivación extra para entender la escuela y fluir en ella,
y también al lado de aquellos a quienes la curiosidad y las ganas de saber les lleva más allá.
</w:t>
</w:r>
</w:p>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Cada uno va a su ritmo, y cada cual pone sus límites</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Aprendemos todos de todos</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Valoramos lo que hemos aprendido</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>SaberMás trabaja con, desde y para la motivación</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Trabajamos en equipo en nuestros proyectos</w:t>
</w:r>
</w:p>
</wx:sub-section>
</wx:sub-section>
</wx:sub-section>
</wx:sect>

View File

@ -1,32 +1,32 @@
\chapter{SaberMás}\label{ID_1}
\section{Complementamos el trabajo de la escuela}\label{ID_27}Todos los contenidos de los talleres están relacionados con el currículo de la enseñanza básica.A diferencia de la práctica tradicional, pretendemos ahondar en el conocimiento partiendo de lo que realmente interesa al niño o niña,ayudándole a que encuentre respuesta a las preguntas que él o ella se plantea.Por ese motivo, SaberMás proyecta estar al lado de los niños que necesitan una motivación extra para entender la escuela y fluir en ella,y también al lado de aquellos a quienes la curiosidad y las ganas de saber les lleva más allá.
\subsection{SaberMás trabaja con, desde y para la motivación}\label{ID_28}
\subsection{Trabajamos en equipo en nuestros proyectos }\label{ID_32}
\subsection{Cada uno va a su ritmo, y cada cual pone sus límites}\label{ID_30}
\subsection{Aprendemos todos de todos}\label{ID_31}
\subsection{Valoramos lo que hemos aprendido}\label{ID_33}
\section{Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas }\label{ID_3}
\section{Trabajo basado en la experimentación y en la investigación}\label{ID_4}
\section{Alternativa a otras actividades de ocio}\label{ID_8}
\section{Actividades centradas en el contexto cercano}\label{ID_37}
\section{Duración limitada: 5-6 semanas}\label{ID_6}
\section{Utilización de medios de expresión artística, digitales y analógicos}\label{ID_5}
\section{Precio también limitado: 100-120?}\label{ID_9}
\section{Uso de la tecnología durante todo el proceso de aprendizaje}\label{ID_23}
\section{Niños y niñas que quieren saber más}\label{ID_7}
\section{Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?)}\label{ID_22}
\section{De 8 a 12 años, sin separación por edades}\label{ID_10}
\section{Máximo 10/1 por taller}\label{ID_19}
\section{Talleres temáticos}\label{ID_2}
\subsection{Naturaleza}\label{ID_13}
\subsubsection{Animales, Plantas, Piedras}\label{ID_17}
\subsection{Arqueología}\label{ID_21}
\subsection{Culturas Antiguas}\label{ID_25}
\subsubsection{Egipto, Grecia, China...}\label{ID_26}
\subsection{Energía}\label{ID_18}
\subsection{Paleontología}\label{ID_38}
\subsection{Astronomía}\label{ID_16}
\subsection{Arquitectura}\label{ID_20}
\subsection{Cocina}\label{ID_11}
\subsection{Poesía}\label{ID_24}
\subsection{Culturas Antiguas}\label{ID_25}
\subsubsection{Egipto, Grecia, China...}\label{ID_26}
\subsection{Paleontología}\label{ID_38}
\section{Duración limitada: 5-6 semanas}\label{ID_6}
\section{Niños y niñas que quieren saber más}\label{ID_7}
\section{Alternativa a otras actividades de ocio}\label{ID_8}
\section{Uso de la tecnología durante todo el proceso de aprendizaje}\label{ID_23}
\section{Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas }\label{ID_3}
\section{Trabajo basado en la experimentación y en la investigación}\label{ID_4}
\section{De 8 a 12 años, sin separación por edades}\label{ID_10}
\section{Máximo 10/1 por taller}\label{ID_19}
\section{Actividades centradas en el contexto cercano}\label{ID_37}
\section{Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?)}\label{ID_22}
\section{Complementamos el trabajo de la escuela}\label{ID_27}Todos los contenidos de los talleres están relacionados con el currículo de la enseñanza básica.A diferencia de la práctica tradicional, pretendemos ahondar en el conocimiento partiendo de lo que realmente interesa al niño o niña,ayudándole a que encuentre respuesta a las preguntas que él o ella se plantea.Por ese motivo, SaberMás proyecta estar al lado de los niños que necesitan una motivación extra para entender la escuela y fluir en ella,y también al lado de aquellos a quienes la curiosidad y las ganas de saber les lleva más allá.
\subsection{Cada uno va a su ritmo, y cada cual pone sus límites}\label{ID_30}
\subsection{Aprendemos todos de todos}\label{ID_31}
\subsection{Valoramos lo que hemos aprendido}\label{ID_33}
\subsection{SaberMás trabaja con, desde y para la motivación}\label{ID_28}
\subsection{Trabajamos en equipo en nuestros proyectos }\label{ID_32}

View File

@ -1,32 +1,5 @@
<map version="0.9.0">
<map version="1.0.1">
<node ID="ID_1" TEXT="SaberM&#225;s">
<node ID="ID_5" POSITION="right" TEXT="Utilizaci&#243;n de medios de expresi&#243;n art&#237;stica, digitales y anal&#243;gicos"/>
<node ID="ID_9" POSITION="left" TEXT="Precio tambi&#233;n limitado: 100-120?"/>
<node ID="ID_2" POSITION="right" TEXT="Talleres tem&#225;ticos">
<node ID="ID_13" POSITION="right" TEXT="Naturaleza">
<node ID="ID_17" POSITION="right" TEXT="Animales, Plantas, Piedras"/>
</node>
<node ID="ID_21" POSITION="right" TEXT="Arqueolog&#237;a"/>
<node ID="ID_18" POSITION="right" TEXT="Energ&#237;a"/>
<node ID="ID_16" POSITION="right" TEXT="Astronom&#237;a"/>
<node ID="ID_20" POSITION="right" TEXT="Arquitectura"/>
<node ID="ID_11" POSITION="right" TEXT="Cocina"/>
<node ID="ID_24" POSITION="right" TEXT="Poes&#237;a"/>
<node ID="ID_25" POSITION="right" TEXT="Culturas Antiguas">
<node ID="ID_26" POSITION="right" TEXT="Egipto, Grecia, China..."/>
</node>
<node ID="ID_38" POSITION="right" TEXT="Paleontolog&#237;a"/>
</node>
<node ID="ID_6" POSITION="left" TEXT="Duraci&#243;n limitada: 5-6 semanas"/>
<node ID="ID_7" POSITION="left" TEXT="Ni&#241;os y ni&#241;as que quieren saber m&#225;s"/>
<node ID="ID_8" POSITION="left" TEXT="Alternativa a otras actividades de ocio"/>
<node ID="ID_23" POSITION="right" TEXT="Uso de la tecnolog&#237;a durante todo el proceso de aprendizaje"/>
<node ID="ID_3" POSITION="right" TEXT="Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas "/>
<node ID="ID_4" POSITION="right" TEXT="Trabajo basado en la experimentaci&#243;n y en la investigaci&#243;n"/>
<node ID="ID_10" POSITION="left" TEXT="De 8 a 12 a&#241;os, sin separaci&#243;n por edades"/>
<node ID="ID_19" POSITION="left" TEXT="M&#225;ximo 10/1 por taller"/>
<node ID="ID_37" POSITION="right" TEXT="Actividades centradas en el contexto cercano"/>
<node ID="ID_22" POSITION="right" TEXT="Flexibilidad en el uso de las lenguas de trabajo (ingl&#233;s, castellano, esukara?)"/>
<node ID="ID_27" POSITION="right" STYLE="bubble" TEXT="Complementamos el trabajo de la escuela">
<richcontent TYPE="NOTE">
<html>
@ -41,11 +14,38 @@
</body>
</html>
</richcontent>
<node ID="ID_30" POSITION="right" TEXT="Cada uno va a su ritmo, y cada cual pone sus l&#237;mites"/>
<node ID="ID_31" POSITION="right" TEXT="Aprendemos todos de todos"/>
<node ID="ID_33" POSITION="right" TEXT="Valoramos lo que hemos aprendido"/>
<node ID="ID_28" POSITION="right" TEXT="SaberM&#225;s trabaja con, desde y para la motivaci&#243;n"/>
<node ID="ID_32" POSITION="right" TEXT="Trabajamos en equipo en nuestros proyectos "/>
<node ID="ID_32" POSITION="right" STYLE="fork" TEXT="Trabajamos en equipo en nuestros proyectos "/>
<node ID="ID_30" POSITION="right" STYLE="fork" TEXT="Cada uno va a su ritmo, y cada cual pone sus l&#237;mites"/>
<node ID="ID_31" POSITION="right" STYLE="fork" TEXT="Aprendemos todos de todos"/>
<node ID="ID_33" POSITION="right" STYLE="fork" TEXT="Valoramos lo que hemos aprendido"/>
</node>
<node ID="ID_3" POSITION="right" STYLE="fork" TEXT="Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas "/>
<node ID="ID_4" POSITION="right" STYLE="fork" TEXT="Trabajo basado en la experimentaci&#243;n y en la investigaci&#243;n"/>
<node ID="ID_8" POSITION="left" STYLE="fork" TEXT="Alternativa a otras actividades de ocio"/>
<node ID="ID_37" POSITION="right" STYLE="fork" TEXT="Actividades centradas en el contexto cercano"/>
<node ID="ID_6" POSITION="left" STYLE="fork" TEXT="Duraci&#243;n limitada: 5-6 semanas"/>
<node ID="ID_5" POSITION="right" STYLE="fork" TEXT="Utilizaci&#243;n de medios de expresi&#243;n art&#237;stica, digitales y anal&#243;gicos"/>
<node ID="ID_9" POSITION="left" STYLE="fork" TEXT="Precio tambi&#233;n limitado: 100-120?"/>
<node ID="ID_23" POSITION="right" STYLE="fork" TEXT="Uso de la tecnolog&#237;a durante todo el proceso de aprendizaje"/>
<node ID="ID_7" POSITION="left" STYLE="fork" TEXT="Ni&#241;os y ni&#241;as que quieren saber m&#225;s"/>
<node ID="ID_22" POSITION="right" STYLE="fork" TEXT="Flexibilidad en el uso de las lenguas de trabajo (ingl&#233;s, castellano, esukara?)"/>
<node ID="ID_10" POSITION="left" STYLE="fork" TEXT="De 8 a 12 a&#241;os, sin separaci&#243;n por edades"/>
<node ID="ID_19" POSITION="left" STYLE="fork" TEXT="M&#225;ximo 10/1 por taller"/>
<node ID="ID_2" POSITION="right" STYLE="fork" TEXT="Talleres tem&#225;ticos">
<node ID="ID_13" POSITION="right" STYLE="fork" TEXT="Naturaleza">
<node ID="ID_17" POSITION="right" STYLE="fork" TEXT="Animales, Plantas, Piedras"/>
</node>
<node ID="ID_21" POSITION="right" STYLE="fork" TEXT="Arqueolog&#237;a"/>
<node ID="ID_25" POSITION="right" STYLE="fork" TEXT="Culturas Antiguas">
<node ID="ID_26" POSITION="right" STYLE="fork" TEXT="Egipto, Grecia, China..."/>
</node>
<node ID="ID_18" POSITION="right" STYLE="fork" TEXT="Energ&#237;a"/>
<node ID="ID_38" POSITION="right" STYLE="fork" TEXT="Paleontolog&#237;a"/>
<node ID="ID_16" POSITION="right" STYLE="fork" TEXT="Astronom&#237;a"/>
<node ID="ID_20" POSITION="right" STYLE="fork" TEXT="Arquitectura"/>
<node ID="ID_11" POSITION="right" STYLE="fork" TEXT="Cocina"/>
<node ID="ID_24" POSITION="right" STYLE="fork" TEXT="Poes&#237;a"/>
</node>
</node>
</map>

File diff suppressed because one or more lines are too long

View File

@ -79,30 +79,6 @@
<text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
</text:sequence-decls>
<text:p text:style-name="Title">SaberMás</text:p>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Utilización de medios de expresión artística, digitales y analógicos</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Precio también limitado: 100-120?</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Talleres temáticos</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Naturaleza</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Animales, Plantas, Piedras</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Arqueología</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Energía</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Astronomía</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Arquitectura</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Cocina</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Poesía</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Culturas Antiguas</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Egipto, Grecia, China...</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Paleontología</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Duración limitada: 5-6 semanas</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Niños y niñas que quieren saber más</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Alternativa a otras actividades de ocio</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Uso de la tecnología durante todo el proceso de aprendizaje</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas </text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Trabajo basado en la experimentación y en la investigación</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">De 8 a 12 años, sin separación por edades</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Máximo 10/1 por taller</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Actividades centradas en el contexto cercano</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?)</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Complementamos el trabajo de la escuela</text:h>
<text:p text:style-name="Standard">Todos los contenidos de los talleres están relacionados con el currículo de la enseñanza básica.</text:p>
<text:p text:style-name="Standard">A diferencia de la práctica tradicional, pretendemos ahondar en el conocimiento partiendo de lo que realmente interesa al niño o niña,</text:p>
@ -110,11 +86,35 @@
<text:p text:style-name="Standard"/>
<text:p text:style-name="Standard">Por ese motivo, SaberMás proyecta estar al lado de los niños que necesitan una motivación extra para entender la escuela y fluir en ella,</text:p>
<text:p text:style-name="Standard">y también al lado de aquellos a quienes la curiosidad y las ganas de saber les lleva más allá.</text:p>
<text:h text:style-name="Heading_20_2" text:outline-level="2">SaberMás trabaja con, desde y para la motivación</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Trabajamos en equipo en nuestros proyectos </text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Cada uno va a su ritmo, y cada cual pone sus límites</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Aprendemos todos de todos</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Valoramos lo que hemos aprendido</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">SaberMás trabaja con, desde y para la motivación</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Trabajamos en equipo en nuestros proyectos </text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas </text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Trabajo basado en la experimentación y en la investigación</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Alternativa a otras actividades de ocio</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Actividades centradas en el contexto cercano</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Duración limitada: 5-6 semanas</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Utilización de medios de expresión artística, digitales y analógicos</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Precio también limitado: 100-120?</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Uso de la tecnología durante todo el proceso de aprendizaje</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Niños y niñas que quieren saber más</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?)</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">De 8 a 12 años, sin separación por edades</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Máximo 10/1 por taller</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Talleres temáticos</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Naturaleza</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Animales, Plantas, Piedras</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Arqueología</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Culturas Antiguas</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Egipto, Grecia, China...</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Energía</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Paleontología</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Astronomía</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Arquitectura</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Cocina</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Poesía</text:h>
</office:text>
</office:body>
</office:document-content>

View File

@ -1,32 +1,32 @@
1 SaberMás
1.1 Utilización de medios de expresión artística, digitales y analógicos
1.2 Precio también limitado: 100-120?
1.3 Talleres temáticos
1.3.1 Naturaleza
1.3.1.1 Animales, Plantas, Piedras
1.3.2 Arqueología
1.3.3 Energía
1.3.4 Astronomía
1.3.5 Arquitectura
1.3.6 Cocina
1.3.7 Poesía
1.3.8 Culturas Antiguas
1.3.8.1 Egipto, Grecia, China...
1.3.9 Paleontología
1.4 Duración limitada: 5-6 semanas
1.5 Niños y niñas que quieren saber más
1.6 Alternativa a otras actividades de ocio
1.7 Uso de la tecnología durante todo el proceso de aprendizaje
1.8 Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas
1.9 Trabajo basado en la experimentación y en la investigación
1.10 De 8 a 12 años, sin separación por edades
1.11 Máximo 10/1 por taller
1.12 Actividades centradas en el contexto cercano
1.13 Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?)
1.14 Complementamos el trabajo de la escuela
1.1 Complementamos el trabajo de la escuela
* Note: Todos los contenidos de los talleres están relacionados con el currículo de la enseñanza básica.A diferencia de la práctica tradicional, pretendemos ahondar en el conocimiento partiendo de lo que realmente interesa al niño o niña,ayudándole a que encuentre respuesta a las preguntas que él o ella se plantea.Por ese motivo, SaberMás proyecta estar al lado de los niños que necesitan una motivación extra para entender la escuela y fluir en ella,y también al lado de aquellos a quienes la curiosidad y las ganas de saber les lleva más allá.
1.14.1 Cada uno va a su ritmo, y cada cual pone sus límites
1.14.2 Aprendemos todos de todos
1.14.3 Valoramos lo que hemos aprendido
1.14.4 SaberMás trabaja con, desde y para la motivación
1.14.5 Trabajamos en equipo en nuestros proyectos
1.1.1 SaberMás trabaja con, desde y para la motivación
1.1.2 Trabajamos en equipo en nuestros proyectos
1.1.3 Cada uno va a su ritmo, y cada cual pone sus límites
1.1.4 Aprendemos todos de todos
1.1.5 Valoramos lo que hemos aprendido
1.2 Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas
1.3 Trabajo basado en la experimentación y en la investigación
1.4 Alternativa a otras actividades de ocio
1.5 Actividades centradas en el contexto cercano
1.6 Duración limitada: 5-6 semanas
1.7 Utilización de medios de expresión artística, digitales y analógicos
1.8 Precio también limitado: 100-120?
1.9 Uso de la tecnología durante todo el proceso de aprendizaje
1.10 Niños y niñas que quieren saber más
1.11 Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?)
1.12 De 8 a 12 años, sin separación por edades
1.13 Máximo 10/1 por taller
1.14 Talleres temáticos
1.14.1 Naturaleza
1.14.1.1 Animales, Plantas, Piedras
1.14.2 Arqueología
1.14.3 Culturas Antiguas
1.14.3.1 Egipto, Grecia, China...
1.14.4 Energía
1.14.5 Paleontología
1.14.6 Astronomía
1.14.7 Arquitectura
1.14.8 Cocina
1.14.9 Poesía

View File

@ -28,6 +28,71 @@
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Complementamos el trabajo de la escuela</Data>
<Comment>
<ss:Data xmlns="http://www.w3.org/TR/REC-html40">
<p>Todos los contenidos de los talleres están relacionados con el currículo de la enseñanza básica.</p>
<p>A diferencia de la práctica tradicional, pretendemos ahondar en el conocimiento partiendo de lo que realmente interesa al niño o niña,</p>
<p>ayudándole a que encuentre respuesta a las preguntas que él o ella se plantea.</p>
<p/>
<p>Por ese motivo, SaberMás proyecta estar al lado de los niños que necesitan una motivación extra para entender la escuela y fluir en ella,</p>
<p>y también al lado de aquellos a quienes la curiosidad y las ganas de saber les lleva más allá.</p>
</ss:Data>
</Comment>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String">SaberMás trabaja con, desde y para la motivación</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String">Trabajamos en equipo en nuestros proyectos </Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String">Cada uno va a su ritmo, y cada cual pone sus límites</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String">Aprendemos todos de todos</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String">Valoramos lo que hemos aprendido</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas </Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Trabajo basado en la experimentación y en la investigación</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Alternativa a otras actividades de ocio</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Actividades centradas en el contexto cercano</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Duración limitada: 5-6 semanas</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Utilización de medios de expresión artística, digitales y analógicos</Data>
</Cell>
</Row>
@ -38,6 +103,31 @@
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Uso de la tecnología durante todo el proceso de aprendizaje</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Niños y niñas que quieren saber más</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?)</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">De 8 a 12 años, sin separación por edades</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Máximo 10/1 por taller</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Talleres temáticos</Data>
</Cell>
</Row>
@ -58,11 +148,26 @@
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String">Culturas Antiguas</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="4">
<Data ss:Type="String">Egipto, Grecia, China...</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String">Energía</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String">Paleontología</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String">Astronomía</Data>
</Cell>
</Row>
@ -81,111 +186,6 @@
<Data ss:Type="String">Poesía</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String">Culturas Antiguas</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="4">
<Data ss:Type="String">Egipto, Grecia, China...</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String">Paleontología</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Duración limitada: 5-6 semanas</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Niños y niñas que quieren saber más</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Alternativa a otras actividades de ocio</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Uso de la tecnología durante todo el proceso de aprendizaje</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Estructura PBL: aprendemos cuando buscamos respuestas a nuestras propias preguntas </Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Trabajo basado en la experimentación y en la investigación</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">De 8 a 12 años, sin separación por edades</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Máximo 10/1 por taller</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Actividades centradas en el contexto cercano</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Flexibilidad en el uso de las lenguas de trabajo (inglés, castellano, esukara?)</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Complementamos el trabajo de la escuela</Data>
<Comment>
<ss:Data xmlns="http://www.w3.org/TR/REC-html40">
<p>Todos los contenidos de los talleres están relacionados con el currículo de la enseñanza básica.</p>
<p>A diferencia de la práctica tradicional, pretendemos ahondar en el conocimiento partiendo de lo que realmente interesa al niño o niña,</p>
<p>ayudándole a que encuentre respuesta a las preguntas que él o ella se plantea.</p>
<p/>
<p>Por ese motivo, SaberMás proyecta estar al lado de los niños que necesitan una motivación extra para entender la escuela y fluir en ella,</p>
<p>y también al lado de aquellos a quienes la curiosidad y las ganas de saber les lleva más allá.</p>
</ss:Data>
</Comment>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String">Cada uno va a su ritmo, y cada cual pone sus límites</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String">Aprendemos todos de todos</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String">Valoramos lo que hemos aprendido</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String">SaberMás trabaja con, desde y para la motivación</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String">Trabajamos en equipo en nuestros proyectos </Data>
</Cell>
</Row>
</Table>
</Worksheet>
</Workbook>

View File

@ -1340,6 +1340,22 @@ Indicator needs
,
,
,
How to improve image
,
,
Rankings
,
,
,
macro indicators
,
,
,
meso-indicators
,
,
Innovation investment climate
,
What investments in innovative projects
,
@ -1493,19 +1509,3 @@ Indicator needs
,
,
Private investment in innovation
,
How to improve image
,
,
Rankings
,
,
,
macro indicators
,
,
,
meso-indicators
,
,
Innovation investment climate

1 Indicator needs
1340 ,
1341 ,
1342
1343 ,
1344 How to improve image
1345 ,
1346 ,
1347 Rankings
1348 ,
1349 ,
1350 ,
1351 macro indicators
1352 ,
1353 ,
1354 ,
1355 meso-indicators
1356 ,
1357 ,
1358 Innovation investment climate
1359 ,
1360 What investments in innovative projects
1361 ,
1509 ,
1510 ,
1511 Private investment in innovation
,
How to improve image
,
,
Rankings
,
,
,
macro indicators
,
,
,
meso-indicators
,
,
Innovation investment climate

View File

@ -2694,6 +2694,56 @@
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>How to improve image</w:t>
</w:r>
</w:p>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Rankings</w:t>
</w:r>
</w:p>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading3"/>
</w:pPr>
<w:r>
<w:t>macro indicators</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading3"/>
</w:pPr>
<w:r>
<w:t>meso-indicators</w:t>
</w:r>
</w:p>
</wx:sub-section>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Innovation investment climate</w:t>
</w:r>
</w:p>
</wx:sub-section>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>What investments in innovative projects</w:t>
</w:r>
</w:p>
@ -3008,56 +3058,6 @@
</wx:sub-section>
</wx:sub-section>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>How to improve image</w:t>
</w:r>
</w:p>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Rankings</w:t>
</w:r>
</w:p>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading3"/>
</w:pPr>
<w:r>
<w:t>macro indicators</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading3"/>
</w:pPr>
<w:r>
<w:t>meso-indicators</w:t>
</w:r>
</w:p>
</wx:sub-section>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Innovation investment climate</w:t>
</w:r>
</w:p>
</wx:sub-section>
</wx:sub-section>
</wx:sub-section>
</wx:sect>
</w:body>

View File

@ -381,6 +381,11 @@
\subsubsection{Impact assessment }\label{ID_290}
\subsubsection{}\label{ID_291}
\subsubsection{}\label{ID_296}
\section{How to improve image}\label{ID_69}
\subsection{Rankings}\label{ID_75}
\subsubsection{macro indicators}\label{ID_70}
\subsubsection{meso-indicators}\label{ID_71}
\subsection{Innovation investment climate}\label{ID_76}
\section{What investments in innovative projects}\label{ID_7}Understanding what investments should be made in innovative projects.
\subsection{Competitive niches}\label{ID_61}
\subsubsection{Clusters behavior}\label{ID_59}\begin{itemize}
@ -431,8 +436,3 @@
\subsection{Competitiveness support factors}\label{ID_64}
\subsubsection{Private investment in innovation}\label{ID_68}
\section{How to improve image}\label{ID_69}
\subsection{Rankings}\label{ID_75}
\subsubsection{macro indicators}\label{ID_70}
\subsubsection{meso-indicators}\label{ID_71}
\subsection{Innovation investment climate}\label{ID_76}

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -348,6 +348,11 @@
<text:h text:style-name="Heading_20_3" text:outline-level="3">Impact assessment </text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Average leverage of 1rub (there would beseveral programs with different leverage)</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Volume of attracted money per one rubleof regional budget expenditures on innovation projects</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">How to improve image</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Rankings</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">macro indicators</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">meso-indicators</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Innovation investment climate</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">What investments in innovative projects</text:h>
<text:p text:style-name="Standard">Understanding what investments should be made in innovative projects.</text:p>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Competitive niches</text:h>
@ -381,11 +386,6 @@
<text:h text:style-name="Heading_20_5" text:outline-level="5">FASIE projects: Number of projects supportedby the FASIE per 1,000 workers [awards/worker]</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Competitiveness support factors</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">Private investment in innovation</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">How to improve image</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Rankings</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">macro indicators</text:h>
<text:h text:style-name="Heading_20_3" text:outline-level="3">meso-indicators</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Innovation investment climate</text:h>
</office:text>
</office:body>
</office:document-content>

View File

@ -51,7 +51,7 @@
1.3.2.1.2 Volume of manufacturing production per capita
1.3.2.1.3 Manufacturing value added per capita (non-natural resource-based)
1.3.2.2 The enabling environment
(see:Innovation investment climate) 1.3.2.2.1 Ease of doing business
1.3.2.2.1 Ease of doing business
* Note: WB
1.3.2.2.1.1 Level of administrative barriers (number and cost of administrative procedures)
1.3.2.2.2 Competition index
@ -205,7 +205,7 @@
1.3.2.4.2.3 Access to certification and licensing for specific activities
1.3.2.4.2.4 Access to suppliers of equipment, production and engineering services
1.3.2.4.3 Innovation infrastructure
1.3.2.4.3.1 Investments
(see:What to do about existing measures) 1.3.2.4.3.1 Investments
1.3.2.4.3.1.1 Public investment in innovation infrastructure
1.3.2.4.3.1.2 Increase of government investment in innovation infrastructure
1.3.2.4.3.1.3 Number of Development institution projects performed in the region
@ -214,7 +214,7 @@
1.3.2.4.3.2 Volume of state support per one company
1.4 What to do about existing measures
* Note: Understanding which measures should be strengthened, dropped or improved, and how.
(see:Innovation infrastructure) 1.4.1 Demand for measure
1.4.1 Demand for measure
1.4.1.1 Quality of beneficiaries
1.4.1.1.1 Growth rates of employment in supported innovative firms
1.4.1.1.2 Growth rates of employment in supported innovative firms
@ -267,41 +267,41 @@
1.4.4.3 Impact assessment
1.4.4.4
1.4.4.5
1.5 What investments in innovative projects
1.5 How to improve image
1.5.1 Rankings
1.5.1.1 macro indicators
1.5.1.2 meso-indicators
1.5.2 Innovation investment climate
(see:The enabling environment) 1.6 What investments in innovative projects
* Note: Understanding what investments should be made in innovative projects.
1.5.1 Competitive niches
1.5.1.1 Clusters behavior
1.5.1.1.1 Cluster EU star rating
1.5.1.1.2 Share of value added of cluster enterprises in GRP
1.5.1.1.3 Share of cluster products in the relevant world market segment
1.5.1.1.4 Share of export in cluster total volume of sales
1.5.1.1.5 Growth of the volume of production in the cluster companies
1.5.1.1.6
1.5.1.1.7 Growth of the volume of innovation production in the cluster
1.5.1.1.8 Share of export in cluster total volume of sales (by zones: US, EU, CIS, other countries)
1.5.1.1.9 Internal behavior
1.5.1.1.9.1 Median wage in the cluster
1.5.1.1.9.2 Growth of the volume of R&D in the cluster
1.5.1.1.9.3 Cluster collaboration
1.5.1.2 R&D
1.5.1.2.1 Patent map
1.5.1.2.2 Publications map
1.5.1.3 Industry
1.5.1.3.1 FDI map
1.5.1.3.2 Gazelle map
1.5.1.3.3 Business R&D expenditures as a share of revenues by sector
1.5.1.3.4 Share of regional products in the world market
1.5.1.3.5 Expenditure on innovation by firm size, by sector
1.5.1.4 Entrepreneurship
1.5.1.4.1 Startup map
1.5.1.4.2 Venture investment map
1.5.1.4.3 Attractiveness to public competitive funding
1.5.1.4.3.1 Fed and regional seed fund investments
1.5.1.4.3.2
1.5.2 Competitiveness support factors
1.5.2.1 Private investment in innovation
1.6 How to improve image
1.6.1 Rankings
1.6.1.1 macro indicators
1.6.1.2 meso-indicators
1.6.2 Innovation investment climate
1.6.1 Competitive niches
1.6.1.1 Clusters behavior
1.6.1.1.1 Cluster EU star rating
1.6.1.1.2 Share of value added of cluster enterprises in GRP
1.6.1.1.3 Share of cluster products in the relevant world market segment
1.6.1.1.4 Share of export in cluster total volume of sales
1.6.1.1.5 Growth of the volume of production in the cluster companies
1.6.1.1.6
1.6.1.1.7 Growth of the volume of innovation production in the cluster
1.6.1.1.8 Share of export in cluster total volume of sales (by zones: US, EU, CIS, other countries)
1.6.1.1.9 Internal behavior
1.6.1.1.9.1 Median wage in the cluster
1.6.1.1.9.2 Growth of the volume of R&D in the cluster
1.6.1.1.9.3 Cluster collaboration
1.6.1.2 R&D
1.6.1.2.1 Patent map
1.6.1.2.2 Publications map
1.6.1.3 Industry
1.6.1.3.1 FDI map
1.6.1.3.2 Gazelle map
1.6.1.3.3 Business R&D expenditures as a share of revenues by sector
1.6.1.3.4 Share of regional products in the world market
1.6.1.3.5 Expenditure on innovation by firm size, by sector
1.6.1.4 Entrepreneurship
1.6.1.4.1 Startup map
1.6.1.4.2 Venture investment map
1.6.1.4.3 Attractiveness to public competitive funding
1.6.1.4.3.1 Fed and regional seed fund investments
1.6.1.4.3.2
1.6.2 Competitiveness support factors
1.6.2.1 Private investment in innovation

View File

@ -1470,6 +1470,31 @@
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">How to improve image</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String">Rankings</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="4">
<Data ss:Type="String">macro indicators</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="4">
<Data ss:Type="String">meso-indicators</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String">Innovation investment climate</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">What investments in innovative projects</Data>
<Comment>
<ss:Data xmlns="http://www.w3.org/TR/REC-html40">
@ -1639,31 +1664,6 @@
<Data ss:Type="String">Private investment in innovation</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">How to improve image</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String">Rankings</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="4">
<Data ss:Type="String">macro indicators</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="4">
<Data ss:Type="String">meso-indicators</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String">Innovation investment climate</Data>
</Cell>
</Row>
</Table>
</Worksheet>
</Workbook>

View File

@ -1,4 +1,4 @@
<map version="0.9.0">
<map version="1.0.1">
<node ID="ID_1" TEXT="Observation">
<richcontent TYPE="NOTE">
<html>

View File

@ -1,24 +1,29 @@
PPM Plan
,
Business Development
,
Backlog Management
,
Freeform IT
,
Client Project Management
,
Governance & Executive
,
Finance
,
Governance & Executive
,
Administration
,
Backlog Management
,
Client Project Management
,
Probono
,
,
,
Freeform IT
,
Community Outreach
,
Human Resources
,
Freeform Hosting
,
Community Outreach
Business Development
,
R&D
,
@ -27,8 +32,3 @@ PPM Plan
,
,
Formulize
,
Probono
,
,

1 PPM Plan
,
Business Development
,
Backlog Management
,
Freeform IT
,
Client Project Management
,
Governance & Executive
2 ,
3 Finance
4 ,
5 Governance & Executive
6 ,
7 Administration
8 ,
9 Backlog Management
10 ,
11 Client Project Management
12 ,
13 Probono
14 ,
15 ,
16
17 ,
18 Freeform IT
19 ,
20 Community Outreach
21 ,
22 Human Resources
23 ,
24 Freeform Hosting
25 ,
26 Community Outreach Business Development
27 ,
28 R&D
29 ,
32 ,
33 ,
34 Formulize
,
Probono
,
,

View File

@ -267,37 +267,7 @@
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Business Development</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Backlog Management</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Freeform IT</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Client Project Management</w:t>
<w:t>Finance</w:t>
</w:r>
</w:p>
</wx:sub-section>
@ -317,7 +287,7 @@
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Finance</w:t>
<w:t>Administration</w:t>
</w:r>
</w:p>
</wx:sub-section>
@ -327,7 +297,57 @@
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Administration</w:t>
<w:t>Backlog Management</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Client Project Management</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Probono</w:t>
</w:r>
</w:p>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t/>
</w:r>
</w:p>
</wx:sub-section>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Freeform IT</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Community Outreach</w:t>
</w:r>
</w:p>
</wx:sub-section>
@ -367,7 +387,7 @@
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Community Outreach</w:t>
<w:t>Business Development</w:t>
</w:r>
</w:p>
</wx:sub-section>
@ -401,26 +421,6 @@
</w:p>
</wx:sub-section>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Probono</w:t>
</w:r>
</w:p>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t/>
</w:r>
</w:p>
</wx:sub-section>
</wx:sub-section>
</wx:sub-section>
</wx:sect>
</w:body>

View File

@ -1,17 +1,17 @@
\chapter{PPM Plan}\label{ID_1}
\section{Business Development }\label{ID_4}
\section{Backlog Management}\label{ID_18}Siehe auch \url{https://docs.google.com/a/freeform.ca/drawings/d/1mrtkVAN3_XefJJCgfxw4Va6xk9TVDBKXDt_uzyIF4Us/edit}
\section{Freeform IT}\label{ID_10}
\section{Client Project Management}\label{ID_204}
\section{Governance &amp; Executive}\label{ID_206}
\section{Finance}\label{ID_5}
\section{Governance &amp; Executive}\label{ID_206}
\section{Administration}\label{ID_3}
\section{Backlog Management}\label{ID_18}Siehe auch \url{https://docs.google.com/a/freeform.ca/drawings/d/1mrtkVAN3_XefJJCgfxw4Va6xk9TVDBKXDt_uzyIF4Us/edit}
\section{Client Project Management}\label{ID_204}
\section{Probono}\label{ID_268}
\subsection{}\label{ID_269}
\section{Freeform IT}\label{ID_10}
\section{Community Outreach}\label{ID_247}
\section{Human Resources}\label{ID_154}
\section{Freeform Hosting}\label{ID_16}
\section{Community Outreach}\label{ID_247}
\section{Business Development }\label{ID_4}
\section{R&amp;D}\label{ID_261}
\subsection{Goals}\label{ID_263}
\subsection{Formulize}\label{ID_264}
\section{Probono}\label{ID_268}
\subsection{}\label{ID_269}

View File

@ -1,28 +1,31 @@
<map version="0.9.0">
<node BACKGROUND_COLOR="#32e36a" ID="ID_1" TEXT="PPM Plan">
<node ID="ID_4" POSITION="right" TEXT="Business Development ">
<font BOLD="true"/>
<map version="1.0.1">
<node ID="ID_1" TEXT="PPM Plan">
<node ID="ID_5" POSITION="right" STYLE="fork" TEXT="Finance">
<font BOLD="true" SIZE="12"/>
</node>
<node ID="ID_206" POSITION="left" STYLE="fork" TEXT="Governance &amp; Executive">
<font BOLD="true" SIZE="12"/>
</node>
<node ID="ID_3" POSITION="right" STYLE="fork" TEXT="Administration">
<font BOLD="true" SIZE="12"/>
</node>
<node ID="ID_18" LINK="https://docs.google.com/a/freeform.ca/drawings/d/1mrtkVAN3_XefJJCgfxw4Va6xk9TVDBKXDt_uzyIF4Us/edit" POSITION="right" TEXT="Backlog Management">
<font BOLD="true"/>
<font BOLD="true" SIZE="12"/>
</node>
<node ID="ID_10" POSITION="left" TEXT="Freeform IT">
<font BOLD="true"/>
<node ID="ID_204" POSITION="left" STYLE="fork" TEXT="Client Project Management">
<font BOLD="true" SIZE="12"/>
</node>
<node ID="ID_204" POSITION="left" TEXT="Client Project Management">
<font BOLD="true"/>
<node ID="ID_268" POSITION="left" STYLE="fork" TEXT="Probono">
<node ID="ID_269" POSITION="left" STYLE="fork"/>
</node>
<node ID="ID_206" POSITION="left" TEXT="Governance &amp; Executive">
<font BOLD="true"/>
<node ID="ID_10" POSITION="left" STYLE="fork" TEXT="Freeform IT">
<font BOLD="true" SIZE="12"/>
</node>
<node ID="ID_5" POSITION="right" TEXT="Finance">
<font BOLD="true"/>
<node ID="ID_247" POSITION="right" STYLE="fork" TEXT="Community Outreach">
<font BOLD="true" SIZE="12"/>
</node>
<node ID="ID_3" POSITION="right" TEXT="Administration">
<font BOLD="true"/>
</node>
<node ID="ID_154" POSITION="right" TEXT="Human Resources">
<font BOLD="true"/>
<node ID="ID_154" POSITION="right" STYLE="fork" TEXT="Human Resources">
<font BOLD="true" SIZE="12"/>
<richcontent TYPE="NOTE">
<html>
<head/>
@ -32,19 +35,16 @@
</html>
</richcontent>
</node>
<node ID="ID_16" POSITION="left" TEXT="Freeform Hosting">
<font BOLD="true"/>
<node ID="ID_16" POSITION="left" STYLE="fork" TEXT="Freeform Hosting">
<font BOLD="true" SIZE="12"/>
</node>
<node ID="ID_247" POSITION="right" TEXT="Community Outreach">
<font BOLD="true"/>
<node ID="ID_4" POSITION="right" STYLE="fork" TEXT="Business Development ">
<font BOLD="true" SIZE="12"/>
</node>
<node ID="ID_261" POSITION="right" TEXT="R&amp;D">
<font BOLD="true"/>
<node ID="ID_263" POSITION="right" TEXT="Goals"/>
<node ID="ID_264" POSITION="right" TEXT="Formulize"/>
</node>
<node ID="ID_268" POSITION="left" TEXT="Probono">
<node ID="ID_269" POSITION="left"/>
<node ID="ID_261" POSITION="right" STYLE="fork" TEXT="R&amp;D">
<font BOLD="true" SIZE="12"/>
<node ID="ID_263" POSITION="right" STYLE="fork" TEXT="Goals"/>
<node ID="ID_264" POSITION="right" STYLE="fork" TEXT="Formulize"/>
</node>
</node>
</map>

View File

@ -1 +1 @@
<?xml version="1.0" encoding="UTF-8"?><ap:Map xmlns:ap="http://schemas.mindjet.com/MindManager/Application/2003"><ap:OneTopic><ap:Topic OId="1W54nezC90m8NYAi2fjQvw=="><ap:SubTopics><ap:Topic OId="4W54nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Business Development "><ap:Font Bold="true"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="1854nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Backlog Management"><ap:Font Bold="true"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/><ap:Hyperlink Url="https://docs.google.com/a/freeform.ca/drawings/d/1mrtkVAN3_XefJJCgfxw4Va6xk9TVDBKXDt_uzyIF4Us/edit"/></ap:Topic><ap:Topic OId="1054nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Freeform IT"><ap:Font Bold="true"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="2044nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Client Project Management"><ap:Font Bold="true"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="2064nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Governance &amp; Executive"><ap:Font Bold="true"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="5W54nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Finance"><ap:Font Bold="true"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="3W54nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Administration"><ap:Font Bold="true"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="1544nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Human Resources"><ap:Font Bold="true"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="1654nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Freeform Hosting"><ap:Font Bold="true"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="2474nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Community Outreach"><ap:Font Bold="true"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="2614nezC90m8NYAi2fjQvw=="><ap:SubTopics><ap:Topic OId="2634nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Goals"><ap:Font/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="2644nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Formulize"><ap:Font/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic></ap:SubTopics><ap:Text PlainText="R&amp;D"><ap:Font Bold="true"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="2684nezC90m8NYAi2fjQvw=="><ap:SubTopics><ap:Topic OId="2694nezC90m8NYAi2fjQvw=="><ap:Text PlainText=""><ap:Font/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic></ap:SubTopics><ap:Text PlainText="Probono"><ap:Font/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic></ap:SubTopics><ap:Text PlainText="PPM Plan"><ap:Font/></ap:Text><ap:Color FillColor="ff32e36a"/><ap:SubTopicShape SubTopicShape="urn:mindjet:RoundedRectangle&#10; "/><ap:SubTopicsShape SubTopicsAlignment="urn:mindjet:Center" SubTopicsGrowth="urn:mindjet:Horizontal" SubTopicsGrowthDirection="urn:mindjet:AutomaticHorizontal&#10; " VerticalDistanceBetweenSiblings="150"/></ap:Topic></ap:OneTopic><ap:Relationships/></ap:Map>
<?xml version="1.0" encoding="UTF-8"?><ap:Map xmlns:ap="http://schemas.mindjet.com/MindManager/Application/2003"><ap:OneTopic><ap:Topic OId="1W54nezC90m8NYAi2fjQvw=="><ap:SubTopics><ap:Topic OId="5W54nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Finance"><ap:Font Bold="true" Size="12"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="2064nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Governance &amp; Executive"><ap:Font Bold="true" Size="12"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="3W54nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Administration"><ap:Font Bold="true" Size="12"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="1854nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Backlog Management"><ap:Font Bold="true" Size="12"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/><ap:Hyperlink Url="https://docs.google.com/a/freeform.ca/drawings/d/1mrtkVAN3_XefJJCgfxw4Va6xk9TVDBKXDt_uzyIF4Us/edit"/></ap:Topic><ap:Topic OId="2044nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Client Project Management"><ap:Font Bold="true" Size="12"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="2684nezC90m8NYAi2fjQvw=="><ap:SubTopics><ap:Topic OId="2694nezC90m8NYAi2fjQvw=="><ap:Text PlainText=""><ap:Font/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic></ap:SubTopics><ap:Text PlainText="Probono"><ap:Font/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="1054nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Freeform IT"><ap:Font Bold="true" Size="12"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="2474nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Community Outreach"><ap:Font Bold="true" Size="12"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="1544nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Human Resources"><ap:Font Bold="true" Size="12"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="1654nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Freeform Hosting"><ap:Font Bold="true" Size="12"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="4W54nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Business Development "><ap:Font Bold="true" Size="12"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="2614nezC90m8NYAi2fjQvw=="><ap:SubTopics><ap:Topic OId="2634nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Goals"><ap:Font/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic><ap:Topic OId="2644nezC90m8NYAi2fjQvw=="><ap:Text PlainText="Formulize"><ap:Font/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic></ap:SubTopics><ap:Text PlainText="R&amp;D"><ap:Font Bold="true" Size="12"/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:Line"/></ap:Topic></ap:SubTopics><ap:Text PlainText="PPM Plan"><ap:Font/></ap:Text><ap:SubTopicShape SubTopicShape="urn:mindjet:RoundedRectangle&#10; "/><ap:SubTopicsShape SubTopicsAlignment="urn:mindjet:Center" SubTopicsGrowth="urn:mindjet:Horizontal" SubTopicsGrowthDirection="urn:mindjet:AutomaticHorizontal&#10; " VerticalDistanceBetweenSiblings="150"/></ap:Topic></ap:OneTopic><ap:Relationships/></ap:Map>

View File

@ -79,25 +79,25 @@
<text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
</text:sequence-decls>
<text:p text:style-name="Title">PPM Plan</text:p>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Business Development </text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Finance</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Governance &amp; Executive</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Administration</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Backlog Management</text:h>
<text:p text:style-name="Standard">
<text:a xmlns:text="text" xmlns:xlink="xlink" xlink:type="simple" xlink:href="https://docs.google.com/a/freeform.ca/drawings/d/1mrtkVAN3_XefJJCgfxw4Va6xk9TVDBKXDt_uzyIF4Us/edit">https://docs.google.com/a/freeform.ca/drawings/d/1mrtkVAN3_XefJJCgfxw4Va6xk9TVDBKXDt_uzyIF4Us/edit</text:a>
</text:p>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Freeform IT</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Client Project Management</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Governance &amp; Executive</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Finance</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Administration</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Probono</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2"/>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Freeform IT</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Community Outreach</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Human Resources</text:h>
<text:p text:style-name="Standard"/>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Freeform Hosting</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Community Outreach</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Business Development </text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">R&amp;D</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Goals</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2">Formulize</text:h>
<text:h text:style-name="Heading_20_1" text:outline-level="1">Probono</text:h>
<text:h text:style-name="Heading_20_2" text:outline-level="2"/>
</office:text>
</office:body>
</office:document-content>

View File

@ -1,18 +1,18 @@
1 PPM Plan
1.1 Business Development
1.2 Backlog Management
1.1 Finance
1.2 Governance & Executive
1.3 Administration
1.4 Backlog Management
* Link: https://docs.google.com/a/freeform.ca/drawings/d/1mrtkVAN3_XefJJCgfxw4Va6xk9TVDBKXDt_uzyIF4Us/edit
1.3 Freeform IT
1.4 Client Project Management
1.5 Governance & Executive
1.6 Finance
1.7 Administration
1.8 Human Resources
1.5 Client Project Management
1.6 Probono
1.6.1
1.7 Freeform IT
1.8 Community Outreach
1.9 Human Resources
* Note:
1.9 Freeform Hosting
1.10 Community Outreach
1.11 R&D
1.11.1 Goals
1.11.2 Formulize
1.12 Probono
1.12.1
1.10 Freeform Hosting
1.11 Business Development
1.12 R&D
1.12.1 Goals
1.12.2 Formulize

View File

@ -28,22 +28,7 @@
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Business Development </Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Backlog Management</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Freeform IT</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Client Project Management</Data>
<Data ss:Type="String">Finance</Data>
</Cell>
</Row>
<Row>
@ -53,12 +38,37 @@
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Finance</Data>
<Data ss:Type="String">Administration</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Administration</Data>
<Data ss:Type="String">Backlog Management</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Client Project Management</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Probono</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String"/>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Freeform IT</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Community Outreach</Data>
</Cell>
</Row>
<Row>
@ -78,7 +88,7 @@
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Community Outreach</Data>
<Data ss:Type="String">Business Development </Data>
</Cell>
</Row>
<Row>
@ -96,16 +106,6 @@
<Data ss:Type="String">Formulize</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="2">
<Data ss:Type="String">Probono</Data>
</Cell>
</Row>
<Row>
<Cell ss:Index="3">
<Data ss:Type="String"/>
</Cell>
</Row>
</Table>
</Worksheet>
</Workbook>

View File

@ -1,6 +1,6 @@
<map version="0.9.0">
<map version="1.0.1">
<node BACKGROUND_COLOR="#ffcc33" COLOR="#0000cc" ID="ID_0" TEXT="">
<font BOLD="true" NAME="Arial"/>
<font BOLD="true" NAME="Arial" SIZE="12"/>
<edge COLOR="#808080"/>
<richcontent TYPE="NOTE">
<html>
@ -12,26 +12,26 @@
</html>
</richcontent>
<node BACKGROUND_COLOR="#ffcc33" COLOR="#0000cc" ID="ID_1" POSITION="right" STYLE="bubble" TEXT="objectifs journ&#233;e">
<font BOLD="true" NAME="Arial"/>
<font BOLD="true" NAME="Arial" SIZE="12"/>
<edge COLOR="#808080"/>
<node BACKGROUND_COLOR="#ffff33" COLOR="#0000cc" ID="ID_2" POSITION="right" STYLE="bubble" TEXT="&quot;business plan&quot; associatif ?">
<font BOLD="true" NAME="Arial"/>
<font BOLD="true" NAME="Arial" SIZE="12"/>
<edge COLOR="#808080"/>
</node>
<node BACKGROUND_COLOR="#ffff33" COLOR="#0000cc" ID="ID_3" POSITION="right" STYLE="bubble" TEXT="mod&#232;le / activit&#233;s responsabilit&#233;s">
<font BOLD="true" NAME="Arial"/>
<font BOLD="true" NAME="Arial" SIZE="12"/>
<edge COLOR="#808080"/>
</node>
<node BACKGROUND_COLOR="#ffff33" COLOR="#0000cc" ID="ID_4" POSITION="right" STYLE="bubble" TEXT="articulations / LOG">
<font BOLD="true" NAME="Arial"/>
<font BOLD="true" NAME="Arial" SIZE="12"/>
<edge COLOR="#808080"/>
</node>
</node>
<node BACKGROUND_COLOR="#ffcc33" COLOR="#0000cc" ID="ID_5" POSITION="right" STYLE="bubble" TEXT="SWOT">
<font BOLD="true" NAME="Arial"/>
<font BOLD="true" NAME="Arial" SIZE="12"/>
<edge COLOR="#808080"/>
<node BACKGROUND_COLOR="#ffff33" COLOR="#0000cc" ID="ID_6" POSITION="right" STYLE="bubble" TEXT="">
<font BOLD="true" NAME="Arial"/>
<font BOLD="true" NAME="Arial" SIZE="12"/>
<edge COLOR="#808080"/>
<node ID="ID_7" POSITION="right" TEXT="l'entreprise a aujourd'hui un potentiel important">
<node ID="ID_8" POSITION="right" TEXT="comp&#233;tences professionnel"/>
@ -77,7 +77,7 @@
<node ID="ID_45" POSITION="right" TEXT="pratiquons en interne et externe une gouvernance explaire etune citoyennt&#233; de r&#234;ve"/>
</node>
<node BACKGROUND_COLOR="#ffff33" COLOR="#0000cc" ID="ID_46" POSITION="right" STYLE="bubble" TEXT="Risques : cauchemars, dangers">
<font BOLD="true" NAME="Arial"/>
<font BOLD="true" NAME="Arial" SIZE="12"/>
<edge COLOR="#808080"/>
<node ID="ID_47" POSITION="right" TEXT="disparition des forces vives, d&#233;part de membres actuels"/>
<node ID="ID_48" POSITION="right" TEXT="opportunit&#233;s atteignables mais difficile"/>

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,45 @@
Artigos GF comentários interessantes
,
Poorter 1999. Functional Ecology. 13:396-410
,
,
Espécies pioneiras crescem mais rápido do que as não pioneiras
,
,
,
Tolerância a sombra está relacionada com persistência e não com crescimento
,
Chazdon 2010. Biotropica. 42(1): 3140
,
,
Falar no artigo que esse trabalho fala que é inadequada a divisão entre pioneira e não pioneira devido a grande variação que há entre elas. Além de terem descoberto que durante a ontogenia a resposta a luminosidade muda dentro de uma mesma espécie. Porém recomendar que essa classificação continue sendo usada em curto prazo enquanto não há informações confiáveis suficiente para esta simples classificação. Outras classificações como esta do artigo são bem vinda, contanto que tenham dados confiáveis. Porém dados estáticos já são difíceis de se obter, dados temporais, como taxa de crescimento em diâmetro ou altura, são mais difíceis ainda. Falar que vários tipos de classificações podem ser utilizadas e quanto mais detalhe melhor, porém os dados é que são mais limitantes. Se focarmos em dados de germinação e crescimento limitantes, como sugerem sainete e whitmore, da uma idéia maismrápida e a curto prazo da classificação destas espécies. Depois com o tempo conseguiremos construir classificações mais detalhadas e com mais dados confiáveis.
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
Baraloto et al. 2010. Functional trait variation and sampling strategies in species-rich plant communities
,
@ -25,44 +66,3 @@ Artigos GF comentários interessantes
,
,
,
Chazdon 2010. Biotropica. 42(1): 3140
,
,
,
,
,
,
Falar no artigo que esse trabalho fala que é inadequada a divisão entre pioneira e não pioneira devido a grande variação que há entre elas. Além de terem descoberto que durante a ontogenia a resposta a luminosidade muda dentro de uma mesma espécie. Porém recomendar que essa classificação continue sendo usada em curto prazo enquanto não há informações confiáveis suficiente para esta simples classificação. Outras classificações como esta do artigo são bem vinda, contanto que tenham dados confiáveis. Porém dados estáticos já são difíceis de se obter, dados temporais, como taxa de crescimento em diâmetro ou altura, são mais difíceis ainda. Falar que vários tipos de classificações podem ser utilizadas e quanto mais detalhe melhor, porém os dados é que são mais limitantes. Se focarmos em dados de germinação e crescimento limitantes, como sugerem sainete e whitmore, da uma idéia maismrápida e a curto prazo da classificação destas espécies. Depois com o tempo conseguiremos construir classificações mais detalhadas e com mais dados confiáveis.
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
Poorter 1999. Functional Ecology. 13:396-410
,
,
Espécies pioneiras crescem mais rápido do que as não pioneiras
,
,
,
Tolerância a sombra está relacionada com persistência e não com crescimento

1 Artigos GF comentários interessantes
2 ,
3 Poorter 1999. Functional Ecology. 13:396-410
4 ,
5 ,
6 Espécies pioneiras crescem mais rápido do que as não pioneiras
7 ,
8 ,
9 ,
10 Tolerância a sombra está relacionada com persistência e não com crescimento
11 ,
12 Chazdon 2010. Biotropica. 42(1): 31–40
13 ,
14 ,
15 Falar no artigo que esse trabalho fala que é inadequada a divisão entre pioneira e não pioneira devido a grande variação que há entre elas. Além de terem descoberto que durante a ontogenia a resposta a luminosidade muda dentro de uma mesma espécie. Porém recomendar que essa classificação continue sendo usada em curto prazo enquanto não há informações confiáveis suficiente para esta simples classificação. Outras classificações como esta do artigo são bem vinda, contanto que tenham dados confiáveis. Porém dados estáticos já são difíceis de se obter, dados temporais, como taxa de crescimento em diâmetro ou altura, são mais difíceis ainda. Falar que vários tipos de classificações podem ser utilizadas e quanto mais detalhe melhor, porém os dados é que são mais limitantes. Se focarmos em dados de germinação e crescimento limitantes, como sugerem sainete e whitmore, da uma idéia maismrápida e a curto prazo da classificação destas espécies. Depois com o tempo conseguiremos construir classificações mais detalhadas e com mais dados confiáveis.
16 ,
17 ,
18
19 ,
20 ,
21
22 ,
23 ,
24
25 ,
26 ,
27
28 ,
29 ,
30
31 ,
32 ,
33
34 ,
35 ,
36
37 ,
38 ,
39
40 ,
41 ,
42
43 ,
44 Baraloto et al. 2010. Functional trait variation and sampling strategies in species-rich plant communities
45 ,
66 ,
67 ,
68
,
Chazdon 2010. Biotropica. 42(1): 31–40
,
,
,
,
,
,
Falar no artigo que esse trabalho fala que é inadequada a divisão entre pioneira e não pioneira devido a grande variação que há entre elas. Além de terem descoberto que durante a ontogenia a resposta a luminosidade muda dentro de uma mesma espécie. Porém recomendar que essa classificação continue sendo usada em curto prazo enquanto não há informações confiáveis suficiente para esta simples classificação. Outras classificações como esta do artigo são bem vinda, contanto que tenham dados confiáveis. Porém dados estáticos já são difíceis de se obter, dados temporais, como taxa de crescimento em diâmetro ou altura, são mais difíceis ainda. Falar que vários tipos de classificações podem ser utilizadas e quanto mais detalhe melhor, porém os dados é que são mais limitantes. Se focarmos em dados de germinação e crescimento limitantes, como sugerem sainete e whitmore, da uma idéia maismrápida e a curto prazo da classificação destas espécies. Depois com o tempo conseguiremos construir classificações mais detalhadas e com mais dados confiáveis.
,
,
,
,
,
,
,
,
,
,
,
,
,
,
,
Poorter 1999. Functional Ecology. 13:396-410
,
,
Espécies pioneiras crescem mais rápido do que as não pioneiras
,
,
,
Tolerância a sombra está relacionada com persistência e não com crescimento

View File

@ -267,6 +267,146 @@
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Poorter 1999. Functional Ecology. 13:396-410</w:t>
</w:r>
</w:p>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Espécies pioneiras crescem mais rápido do que as não pioneiras</w:t>
</w:r>
</w:p>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading3"/>
</w:pPr>
<w:r>
<w:t>Tolerância a sombra está relacionada com persistência e não com crescimento</w:t>
</w:r>
</w:p>
</wx:sub-section>
</wx:sub-section>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Chazdon 2010. Biotropica. 42(1): 3140</w:t>
</w:r>
</w:p>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Falar no artigo que esse trabalho fala que é inadequada a divisão entre pioneira e não pioneira devido a grande variação que há entre elas. Além de terem descoberto que durante a ontogenia a resposta a luminosidade muda dentro de uma mesma espécie. Porém recomendar que essa classificação continue sendo usada em curto prazo enquanto não há informações confiáveis suficiente para esta simples classificação. Outras classificações como esta do artigo são bem vinda, contanto que tenham dados confiáveis. Porém dados estáticos já são difíceis de se obter, dados temporais, como taxa de crescimento em diâmetro ou altura, são mais difíceis ainda. Falar que vários tipos de classificações podem ser utilizadas e quanto mais detalhe melhor, porém os dados é que são mais limitantes. Se focarmos em dados de germinação e crescimento limitantes, como sugerem sainete e whitmore, da uma idéia maismrápida e a curto prazo da classificação destas espécies. Depois com o tempo conseguiremos construir classificações mais detalhadas e com mais dados confiáveis.</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Here, we develop a new approach that links functional attributes of tree species with studies of forest recovery and regional land-use transitions (Chazdon et al. 2007). Grouping species according to their functional attributes or demographic rates provides insight into both applied and theoretical questions, such as selecting species for reforestation programs, assessing ecosystem services, and understanding community assembly processes in tropical forests (Diaz et al. 2007, Kraft et al. 2008).</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Since we have data on leaf and wood functional traits for only a subset of the species in our study sites, we based our functional type classification on information for a large number of tree species obtained through vegetation monitoring studies.</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Our approach avoided preconceived notions of successional behavior or shade tolerance of tree species by developing an objective and independent classification of functional types based on vegetation monitoring data from permanent sample plots in mature and secondary forests of northeastern Costa Rica (Finegan et al. 1999, Chazdon et al. 2007).We apply an independent, prior classification of 293 tree species from our study region into five functional types, based on two species attributes: canopy strata and diameter growth rates for individuals Z10 cm dbh (Finegan et al. 1999, Salgado- Negret 2007).</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Our results demonstrate strong linkages between functional types defined by adult height and growth rates of large trees and colonization groups based on the timing of seedling, sapling, and tree recruitment in secondary forests.</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>These results allow us to move beyond earlier conceptual frameworks of tropical forest secondary succession developed by Finegan (1996) and Chazdon (2008) based on subjective groupings, such as pioneers and shade-tolerant species (Swaine &amp; Whitmore 1988).</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Reproductive traits, such as dispersal mode, pollination mode, and sexual system, were ultimately not useful in delimiting tree functional types for the tree species examined here (Salgado-Negret 2007). Thus, although reproductive traits do vary quantitatively in abundance between secondary and mature forests in our landscape (Chazdon et al. 2003), they do not seem to be important drivers of successional dynamics of trees Z10 cm dbh. For seedlings, however, dispersal mode and seed size are likely to play an important role in community dynamics during succession (Dalling&amp;Hubbell 2002).</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Our classification of colonization groups defies the traditional dichotomy between late successional shade-tolerant and early successional pioneer species. Many tree species, classified here as regenerating pioneers on the basis of their population structure in secondary forests, are common in both young secondary forest and mature forests in this region (Guariguata et al. 1997), and many are important timber species (Vilchez et al. 2008). These generalists are by far the most abundant species of seedlings and saplings, conferring a high degree of resilience in the wet tropical forests of NE Costa Rica (Norden et al. 2009, Letcher &amp; Chazdon 2009). The high abundance of regenerating pioneers in seedling and sapling size classes clearly shows that species with shade-tolerant seedlings can also recruit as trees early in succession. For these species, early tree colonization enhances seedling and sapling recruitment during the first 2030 yr of succession, due to local seed rain. Species abundance and size distribution depend strongly on chance colonization events early in succession (Chazdon 2008). Other studies have shown that mature forest species are able to colonize early in succession (Finegan 1996, van Breugel et al. 2007, Franklin &amp; Rey 2007, Ochoa-Gaona et al. 2007), emphasizing the importance of initial floristic composition in the determination of successional pathways and rates of forest regrowth. On the other hand, significant numbers of species in our sites (40% overall and the majority of rare species) colonized only after canopy closure, and these species may not occur as mature individuals until decades after agricultural abandonment.</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Classifying functional types based on functional traits with low plasticity, such as wood density and seed size, could potentially serve as robust proxies for demographic variables (Poorter et al. 2008, Zhang et al. 2008).</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>CONDIT, R., S. P. HUBBELL, AND R. B. FOSTER. 1996. Assessing the response of plant functional types in tropical forests to climatic change. J. Veg. Sci. 7: 405416. DALLING, J. S., AND S. P. HUBBELL. 2002. Seed size, growth rate and gap microsite conditions as determinants of recruitment success for pioneer species. J. Ecol. 90: 557568. FINEGAN, B. 1996. Pattern and process in neotropical secondary forests: The first 100 years of succession. Trends Ecol. Evol. 11: 119124. POORTER, L., S. J. WRIGHT, H. PAZ, D. D. ACKERLY, R. CONDIT, G. IBARRA-MANRI´QUEZ, K. E. HARMS, J. C. LICONA, M.MARTI´NEZ-RAMOS, S. J. MAZER, H. C. MULLER-LANDAU, M. PEN˜ A-CLAROS, C. O. WEBB, AND I. J. WRIGHT. 2008. Are functional traits good predictors of demographic rates? Evidence from five Neotropical forests. Ecology 89: 19081920. ZHANG, Z. D., R. G. ZANG, AND Y. D. QI. 2008. Spatiotemporal patterns and dynamics of species richness and abundance of woody plant functional groups in a tropical forest landscape of Hainan Island, South China. J. Integr. Plant Biol. 50: 547558.</w:t>
</w:r>
</w:p>
</wx:sub-section>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Baraloto et al. 2010. Functional trait variation and sampling strategies in species-rich plant communities</w:t>
</w:r>
</w:p>
@ -373,146 +513,6 @@
</w:p>
</wx:sub-section>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Chazdon 2010. Biotropica. 42(1): 3140</w:t>
</w:r>
</w:p>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Here, we develop a new approach that links functional attributes of tree species with studies of forest recovery and regional land-use transitions (Chazdon et al. 2007). Grouping species according to their functional attributes or demographic rates provides insight into both applied and theoretical questions, such as selecting species for reforestation programs, assessing ecosystem services, and understanding community assembly processes in tropical forests (Diaz et al. 2007, Kraft et al. 2008).</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Since we have data on leaf and wood functional traits for only a subset of the species in our study sites, we based our functional type classification on information for a large number of tree species obtained through vegetation monitoring studies.</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Falar no artigo que esse trabalho fala que é inadequada a divisão entre pioneira e não pioneira devido a grande variação que há entre elas. Além de terem descoberto que durante a ontogenia a resposta a luminosidade muda dentro de uma mesma espécie. Porém recomendar que essa classificação continue sendo usada em curto prazo enquanto não há informações confiáveis suficiente para esta simples classificação. Outras classificações como esta do artigo são bem vinda, contanto que tenham dados confiáveis. Porém dados estáticos já são difíceis de se obter, dados temporais, como taxa de crescimento em diâmetro ou altura, são mais difíceis ainda. Falar que vários tipos de classificações podem ser utilizadas e quanto mais detalhe melhor, porém os dados é que são mais limitantes. Se focarmos em dados de germinação e crescimento limitantes, como sugerem sainete e whitmore, da uma idéia maismrápida e a curto prazo da classificação destas espécies. Depois com o tempo conseguiremos construir classificações mais detalhadas e com mais dados confiáveis.</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Our approach avoided preconceived notions of successional behavior or shade tolerance of tree species by developing an objective and independent classification of functional types based on vegetation monitoring data from permanent sample plots in mature and secondary forests of northeastern Costa Rica (Finegan et al. 1999, Chazdon et al. 2007).We apply an independent, prior classification of 293 tree species from our study region into five functional types, based on two species attributes: canopy strata and diameter growth rates for individuals Z10 cm dbh (Finegan et al. 1999, Salgado- Negret 2007).</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Our results demonstrate strong linkages between functional types defined by adult height and growth rates of large trees and colonization groups based on the timing of seedling, sapling, and tree recruitment in secondary forests.</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>These results allow us to move beyond earlier conceptual frameworks of tropical forest secondary succession developed by Finegan (1996) and Chazdon (2008) based on subjective groupings, such as pioneers and shade-tolerant species (Swaine &amp; Whitmore 1988).</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Reproductive traits, such as dispersal mode, pollination mode, and sexual system, were ultimately not useful in delimiting tree functional types for the tree species examined here (Salgado-Negret 2007). Thus, although reproductive traits do vary quantitatively in abundance between secondary and mature forests in our landscape (Chazdon et al. 2003), they do not seem to be important drivers of successional dynamics of trees Z10 cm dbh. For seedlings, however, dispersal mode and seed size are likely to play an important role in community dynamics during succession (Dalling&amp;Hubbell 2002).</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Our classification of colonization groups defies the traditional dichotomy between late successional shade-tolerant and early successional pioneer species. Many tree species, classified here as regenerating pioneers on the basis of their population structure in secondary forests, are common in both young secondary forest and mature forests in this region (Guariguata et al. 1997), and many are important timber species (Vilchez et al. 2008). These generalists are by far the most abundant species of seedlings and saplings, conferring a high degree of resilience in the wet tropical forests of NE Costa Rica (Norden et al. 2009, Letcher &amp; Chazdon 2009). The high abundance of regenerating pioneers in seedling and sapling size classes clearly shows that species with shade-tolerant seedlings can also recruit as trees early in succession. For these species, early tree colonization enhances seedling and sapling recruitment during the first 2030 yr of succession, due to local seed rain. Species abundance and size distribution depend strongly on chance colonization events early in succession (Chazdon 2008). Other studies have shown that mature forest species are able to colonize early in succession (Finegan 1996, van Breugel et al. 2007, Franklin &amp; Rey 2007, Ochoa-Gaona et al. 2007), emphasizing the importance of initial floristic composition in the determination of successional pathways and rates of forest regrowth. On the other hand, significant numbers of species in our sites (40% overall and the majority of rare species) colonized only after canopy closure, and these species may not occur as mature individuals until decades after agricultural abandonment.</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Classifying functional types based on functional traits with low plasticity, such as wood density and seed size, could potentially serve as robust proxies for demographic variables (Poorter et al. 2008, Zhang et al. 2008).</w:t>
</w:r>
</w:p>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>CONDIT, R., S. P. HUBBELL, AND R. B. FOSTER. 1996. Assessing the response of plant functional types in tropical forests to climatic change. J. Veg. Sci. 7: 405416. DALLING, J. S., AND S. P. HUBBELL. 2002. Seed size, growth rate and gap microsite conditions as determinants of recruitment success for pioneer species. J. Ecol. 90: 557568. FINEGAN, B. 1996. Pattern and process in neotropical secondary forests: The first 100 years of succession. Trends Ecol. Evol. 11: 119124. POORTER, L., S. J. WRIGHT, H. PAZ, D. D. ACKERLY, R. CONDIT, G. IBARRA-MANRI´QUEZ, K. E. HARMS, J. C. LICONA, M.MARTI´NEZ-RAMOS, S. J. MAZER, H. C. MULLER-LANDAU, M. PEN˜ A-CLAROS, C. O. WEBB, AND I. J. WRIGHT. 2008. Are functional traits good predictors of demographic rates? Evidence from five Neotropical forests. Ecology 89: 19081920. ZHANG, Z. D., R. G. ZANG, AND Y. D. QI. 2008. Spatiotemporal patterns and dynamics of species richness and abundance of woody plant functional groups in a tropical forest landscape of Hainan Island, South China. J. Integr. Plant Biol. 50: 547558.</w:t>
</w:r>
</w:p>
</wx:sub-section>
</wx:sub-section>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading1"/>
</w:pPr>
<w:r>
<w:t>Poorter 1999. Functional Ecology. 13:396-410</w:t>
</w:r>
</w:p>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading2"/>
</w:pPr>
<w:r>
<w:t>Espécies pioneiras crescem mais rápido do que as não pioneiras</w:t>
</w:r>
</w:p>
<wx:sub-section>
<w:p>
<w:pPr>
<w:pStyle w:val="Heading3"/>
</w:pPr>
<w:r>
<w:t>Tolerância a sombra está relacionada com persistência e não com crescimento</w:t>
</w:r>
</w:p>
</wx:sub-section>
</wx:sub-section>
</wx:sub-section>
</wx:sub-section>
</wx:sect>
</w:body>

View File

@ -1,5 +1,19 @@
\chapter{Artigos GF comentários interessantes}\label{ID_1}
\section{Poorter 1999. Functional Ecology. 13:396-410}\label{ID_2}
\subsection{Espécies pioneiras crescem mais rápido do que as não pioneiras}\label{ID_3}
\subsubsection{Tolerância a sombra está relacionada com persistência e não com crescimento}\label{ID_4}
\section{Chazdon 2010. Biotropica. 42(1): 3140}\label{ID_17}
\subsection{Falar no artigo que esse trabalho fala que é inadequada a divisão entre pioneira e não pioneira devido a grande variação que há entre elas. Além de terem descoberto que durante a ontogenia a resposta a luminosidade muda dentro de uma mesma espécie. Porém recomendar que essa classificação continue sendo usada em curto prazo enquanto não há informações confiáveis suficiente para esta simples classificação. Outras classificações como esta do artigo são bem vinda, contanto que tenham dados confiáveis. Porém dados estáticos já são difíceis de se obter, dados temporais, como taxa de crescimento em diâmetro ou altura, são mais difíceis ainda. Falar que vários tipos de classificações podem ser utilizadas e quanto mais detalhe melhor, porém os dados é que são mais limitantes. Se focarmos em dados de germinação e crescimento limitantes, como sugerem sainete e whitmore, da uma idéia maismrápida e a curto prazo da classificação destas espécies. Depois com o tempo conseguiremos construir classificações mais detalhadas e com mais dados confiáveis. }\label{ID_24}
\subsection{}\label{ID_22}
\subsection{}\label{ID_23}
\subsection{}\label{ID_25}
\subsection{}\label{ID_26}
\subsection{}\label{ID_27}
\subsection{}\label{ID_28}
\subsection{}\label{ID_29}
\subsection{}\label{ID_30}
\subsection{}\label{ID_31}
\section{Baraloto et al. 2010. Functional trait variation and sampling strategies in species-rich plant communities}\label{ID_5}
\subsection{}\label{ID_6}
\subsection{}\label{ID_7}
@ -9,17 +23,3 @@
\subsection{Intensas amostragens de experimentos simples tem maior retorno em acurácia de estimativa e de custo tb.}\label{ID_13}
\subsection{}\label{ID_14}Isso significa que estudos de característica de história de vida compensam? Ver nos m&amp;m.
\subsection{}\label{ID_15}Falar que isso corrobora nossa sugestão de utilizar poucas medidas, mas que elas sejam confiáveis.
\section{Chazdon 2010. Biotropica. 42(1): 3140}\label{ID_17}
\subsection{}\label{ID_22}
\subsection{}\label{ID_23}
\subsection{Falar no artigo que esse trabalho fala que é inadequada a divisão entre pioneira e não pioneira devido a grande variação que há entre elas. Além de terem descoberto que durante a ontogenia a resposta a luminosidade muda dentro de uma mesma espécie. Porém recomendar que essa classificação continue sendo usada em curto prazo enquanto não há informações confiáveis suficiente para esta simples classificação. Outras classificações como esta do artigo são bem vinda, contanto que tenham dados confiáveis. Porém dados estáticos já são difíceis de se obter, dados temporais, como taxa de crescimento em diâmetro ou altura, são mais difíceis ainda. Falar que vários tipos de classificações podem ser utilizadas e quanto mais detalhe melhor, porém os dados é que são mais limitantes. Se focarmos em dados de germinação e crescimento limitantes, como sugerem sainete e whitmore, da uma idéia maismrápida e a curto prazo da classificação destas espécies. Depois com o tempo conseguiremos construir classificações mais detalhadas e com mais dados confiáveis. }\label{ID_24}
\subsection{}\label{ID_25}
\subsection{}\label{ID_26}
\subsection{}\label{ID_27}
\subsection{}\label{ID_28}
\subsection{}\label{ID_29}
\subsection{}\label{ID_30}
\subsection{}\label{ID_31}
\section{Poorter 1999. Functional Ecology. 13:396-410}\label{ID_2}
\subsection{Espécies pioneiras crescem mais rápido do que as não pioneiras}\label{ID_3}
\subsubsection{Tolerância a sombra está relacionada com persistência e não com crescimento}\label{ID_4}

View File

@ -1,113 +1,15 @@
<map version="0.9.0">
<map version="1.0.1">
<node ID="ID_1" TEXT="Artigos GF coment&#225;rios interessantes">
<node BACKGROUND_COLOR="#cccccc" ID="ID_5" POSITION="left" STYLE="rectagle" TEXT="Baraloto et al. 2010. Functional trait variation and sampling strategies in species-rich plant communities">
<node BACKGROUND_COLOR="#cccccc" COLOR="#000000" ID="ID_2" POSITION="left" STYLE="rectagle" TEXT="Poorter 1999. Functional Ecology. 13:396-410">
<edge COLOR="#cccccc"/>
<node ID="ID_6" POSITION="left">
<richcontent TYPE="NODE">
<html>
<head/>
<body>
<p>Therecent growth of large functional trait data</p>
<p>bases has been fuelled by standardized protocols forthe</p>
<p>measurement of individual functional traits and intensive</p>
<p>efforts to compile trait data(Cornelissen etal. 2003; Chave etal. 2009). Nonetheless, there remains no consensusfor</p>
<p>the most appropriate sampling design so that traits can be</p>
<p>scaled from the individuals on whom measurements are</p>
<p>made to the community or ecosystem levels at which infer-</p>
<p>ences are drawn (Swenson etal. 2006,2007,Reich,Wright</p>
<p>&amp; Lusk 2007;Kraft,Valencia &amp; Ackerly 2008).</p>
</body>
</html>
</richcontent>
</node>
<node ID="ID_7" POSITION="left">
<richcontent TYPE="NODE">
<html>
<head/>
<body>
<p>However, the fast pace of</p>
<p>development of plant trait meta-analyses also suggests that</p>
<p>trait acquisition in the field is a factor limiting the growth of</p>
<p>plant trait data bases.</p>
</body>
</html>
</richcontent>
</node>
<node ID="ID_8" POSITION="left">
<richcontent TYPE="NODE">
<html>
<head/>
<body>
<p>We measured</p>
<p>traits for every individual tree in nine 1-ha plots in tropical</p>
<p>lowland rainforest (N = 4709). Each plant was sampled for</p>
<p>10 functional traits related to wood and leaf morphology and</p>
<p>ecophysiology. Here, we contrast the trait means and variances</p>
<p>obtained with a full sampling strategy with those of</p>
<p>other sampling designs used in the recent literature, which we</p>
<p>obtain by simulation. We assess the differences in community-</p>
<p>level estimates of functional trait means and variances</p>
<p>among design types and sampling intensities. We then contrast</p>
<p>the relative costs of these designs and discuss the appropriateness</p>
<p>of different sampling designs and intensities for</p>
<p>different questions and systems.</p>
</body>
</html>
</richcontent>
</node>
<node ID="ID_9" POSITION="left" TEXT="Falar que a escolha das categorias de sucess&#227;o e dos par&#226;metros ou caracter&#237;stica dos indiv&#237;duos que ser&#227;o utilizadas dependera da facilidade de coleta dos dados e do custo monet&#225;rio e temporal."/>
<node ID="ID_12" POSITION="left" TEXT="Ver se classifica sucess&#227;o por densidade de tronco para citar no artigo como exemplo de outros atributos al&#233;m de germina&#231;&#227;o e ver se e custoso no tempo e em dinheiro"/>
<node ID="ID_13" POSITION="left" TEXT="Intensas amostragens de experimentos simples tem maior retorno em acur&#225;cia de estimativa e de custo tb."/>
<node ID="ID_14" POSITION="left">
<richcontent TYPE="NODE">
<html>
<head/>
<body>
<p>With regard to estimating mean trait values, strategies</p>
<p>alternative to BRIDGE were consistently cost-effective. On</p>
<p>the other hand, strategies alternative to BRIDGE clearly</p>
<p>failed to accurately estimate the variance of trait values. This</p>
<p>indicates that in situations where accurate estimation of plotlevel</p>
<p>variance is desired, complete censuses are essential.</p>
</body>
</html>
</richcontent>
<richcontent TYPE="NOTE">
<html>
<head/>
<body>
<p/>
<p>Isso significa que estudos de caracter&#237;stica de hist&#243;ria de vida compensam? Ver nos m&amp;m.</p>
</body>
</html>
</richcontent>
</node>
<node ID="ID_15" POSITION="left">
<richcontent TYPE="NODE">
<html>
<head/>
<body>
<p>We suggest that, in these studies,</p>
<p>the investment in complete sampling may be worthwhile</p>
<p>for at least some traits.</p>
</body>
</html>
</richcontent>
<richcontent TYPE="NOTE">
<html>
<head/>
<body>
<p/>
<p>Falar que isso corrobora nossa sugest&#227;o de utilizar poucas medidas, mas que elas sejam confi&#225;veis.</p>
</body>
</html>
</richcontent>
<node ID="ID_3" POSITION="left" STYLE="fork" TEXT="Esp&#233;cies pioneiras crescem mais r&#225;pido do que as n&#227;o pioneiras">
<node ID="ID_4" POSITION="left" STYLE="fork" TEXT="Toler&#226;ncia a sombra est&#225; relacionada com persist&#234;ncia e n&#227;o com crescimento"/>
</node>
</node>
<node BACKGROUND_COLOR="#cccccc" COLOR="#000000" ID="ID_17" POSITION="right" STYLE="rectagle" TEXT="Chazdon 2010. Biotropica. 42(1): 31&#8211;40">
<font/>
<edge COLOR="#cccccc"/>
<node ID="ID_22" POSITION="right">
<node ID="ID_24" POSITION="right" STYLE="fork" TEXT="Falar no artigo que esse trabalho fala que &#233; inadequada a divis&#227;o entre pioneira e n&#227;o pioneira devido a grande varia&#231;&#227;o que h&#225; entre elas. Al&#233;m de terem descoberto que durante a ontogenia a resposta a luminosidade muda dentro de uma mesma esp&#233;cie. Por&#233;m recomendar que essa classifica&#231;&#227;o continue sendo usada em curto prazo enquanto n&#227;o h&#225; informa&#231;&#245;es confi&#225;veis suficiente para esta simples classifica&#231;&#227;o. Outras classifica&#231;&#245;es como esta do artigo s&#227;o bem vinda, contanto que tenham dados confi&#225;veis. Por&#233;m dados est&#225;ticos j&#225; s&#227;o dif&#237;ceis de se obter, dados temporais, como taxa de crescimento em di&#226;metro ou altura, s&#227;o mais dif&#237;ceis ainda. Falar que v&#225;rios tipos de classifica&#231;&#245;es podem ser utilizadas e quanto mais detalhe melhor, por&#233;m os dados &#233; que s&#227;o mais limitantes. Se focarmos em dados de germina&#231;&#227;o e crescimento limitantes, como sugerem sainete e whitmore, da uma id&#233;ia maismr&#225;pida e a curto prazo da classifica&#231;&#227;o destas esp&#233;cies. Depois com o tempo conseguiremos construir classifica&#231;&#245;es mais detalhadas e com mais dados confi&#225;veis. "/>
<node ID="ID_22" POSITION="right" STYLE="fork">
<richcontent TYPE="NODE">
<html>
<head/>
@ -124,7 +26,7 @@
</html>
</richcontent>
</node>
<node ID="ID_23" POSITION="right">
<node ID="ID_23" POSITION="right" STYLE="fork">
<richcontent TYPE="NODE">
<html>
<head/>
@ -138,8 +40,7 @@
</html>
</richcontent>
</node>
<node ID="ID_24" POSITION="right" TEXT="Falar no artigo que esse trabalho fala que &#233; inadequada a divis&#227;o entre pioneira e n&#227;o pioneira devido a grande varia&#231;&#227;o que h&#225; entre elas. Al&#233;m de terem descoberto que durante a ontogenia a resposta a luminosidade muda dentro de uma mesma esp&#233;cie. Por&#233;m recomendar que essa classifica&#231;&#227;o continue sendo usada em curto prazo enquanto n&#227;o h&#225; informa&#231;&#245;es confi&#225;veis suficiente para esta simples classifica&#231;&#227;o. Outras classifica&#231;&#245;es como esta do artigo s&#227;o bem vinda, contanto que tenham dados confi&#225;veis. Por&#233;m dados est&#225;ticos j&#225; s&#227;o dif&#237;ceis de se obter, dados temporais, como taxa de crescimento em di&#226;metro ou altura, s&#227;o mais dif&#237;ceis ainda. Falar que v&#225;rios tipos de classifica&#231;&#245;es podem ser utilizadas e quanto mais detalhe melhor, por&#233;m os dados &#233; que s&#227;o mais limitantes. Se focarmos em dados de germina&#231;&#227;o e crescimento limitantes, como sugerem sainete e whitmore, da uma id&#233;ia maismr&#225;pida e a curto prazo da classifica&#231;&#227;o destas esp&#233;cies. Depois com o tempo conseguiremos construir classifica&#231;&#245;es mais detalhadas e com mais dados confi&#225;veis. "/>
<node ID="ID_25" POSITION="right">
<node ID="ID_25" POSITION="right" STYLE="fork">
<richcontent TYPE="NODE">
<html>
<head/>
@ -157,7 +58,7 @@
</html>
</richcontent>
</node>
<node ID="ID_26" POSITION="right">
<node ID="ID_26" POSITION="right" STYLE="fork">
<richcontent TYPE="NODE">
<html>
<head/>
@ -170,7 +71,7 @@
</html>
</richcontent>
</node>
<node ID="ID_27" POSITION="right">
<node ID="ID_27" POSITION="right" STYLE="fork">
<richcontent TYPE="NODE">
<html>
<head/>
@ -184,7 +85,7 @@
</html>
</richcontent>
</node>
<node ID="ID_28" POSITION="right">
<node ID="ID_28" POSITION="right" STYLE="fork">
<richcontent TYPE="NODE">
<html>
<head/>
@ -203,7 +104,7 @@
</html>
</richcontent>
</node>
<node ID="ID_29" POSITION="right">
<node ID="ID_29" POSITION="right" STYLE="fork">
<richcontent TYPE="NODE">
<html>
<head/>
@ -238,7 +139,7 @@
</html>
</richcontent>
</node>
<node ID="ID_30" POSITION="right">
<node ID="ID_30" POSITION="right" STYLE="fork">
<richcontent TYPE="NODE">
<html>
<head/>
@ -251,7 +152,7 @@
</html>
</richcontent>
</node>
<node ID="ID_31" POSITION="right">
<node ID="ID_31" POSITION="right" STYLE="fork">
<richcontent TYPE="NODE">
<html>
<head/>
@ -279,11 +180,108 @@
</richcontent>
</node>
</node>
<node BACKGROUND_COLOR="#cccccc" COLOR="#000000" ID="ID_2" POSITION="left" STYLE="rectagle" TEXT="Poorter 1999. Functional Ecology. 13:396-410">
<font/>
<node BACKGROUND_COLOR="#cccccc" ID="ID_5" POSITION="left" STYLE="rectagle" TEXT="Baraloto et al. 2010. Functional trait variation and sampling strategies in species-rich plant communities">
<edge COLOR="#cccccc"/>
<node ID="ID_3" POSITION="left" TEXT="Esp&#233;cies pioneiras crescem mais r&#225;pido do que as n&#227;o pioneiras">
<node ID="ID_4" POSITION="left" TEXT="Toler&#226;ncia a sombra est&#225; relacionada com persist&#234;ncia e n&#227;o com crescimento"/>
<node ID="ID_6" POSITION="left" STYLE="fork">
<richcontent TYPE="NODE">
<html>
<head/>
<body>
<p>Therecent growth of large functional trait data</p>
<p>bases has been fuelled by standardized protocols forthe</p>
<p>measurement of individual functional traits and intensive</p>
<p>efforts to compile trait data(Cornelissen etal. 2003; Chave etal. 2009). Nonetheless, there remains no consensusfor</p>
<p>the most appropriate sampling design so that traits can be</p>
<p>scaled from the individuals on whom measurements are</p>
<p>made to the community or ecosystem levels at which infer-</p>
<p>ences are drawn (Swenson etal. 2006,2007,Reich,Wright</p>
<p>&amp; Lusk 2007;Kraft,Valencia &amp; Ackerly 2008).</p>
</body>
</html>
</richcontent>
</node>
<node ID="ID_7" POSITION="left" STYLE="fork">
<richcontent TYPE="NODE">
<html>
<head/>
<body>
<p>However, the fast pace of</p>
<p>development of plant trait meta-analyses also suggests that</p>
<p>trait acquisition in the field is a factor limiting the growth of</p>
<p>plant trait data bases.</p>
</body>
</html>
</richcontent>
</node>
<node ID="ID_8" POSITION="left" STYLE="fork">
<richcontent TYPE="NODE">
<html>
<head/>
<body>
<p>We measured</p>
<p>traits for every individual tree in nine 1-ha plots in tropical</p>
<p>lowland rainforest (N = 4709). Each plant was sampled for</p>
<p>10 functional traits related to wood and leaf morphology and</p>
<p>ecophysiology. Here, we contrast the trait means and variances</p>
<p>obtained with a full sampling strategy with those of</p>
<p>other sampling designs used in the recent literature, which we</p>
<p>obtain by simulation. We assess the differences in community-</p>
<p>level estimates of functional trait means and variances</p>
<p>among design types and sampling intensities. We then contrast</p>
<p>the relative costs of these designs and discuss the appropriateness</p>
<p>of different sampling designs and intensities for</p>
<p>different questions and systems.</p>
</body>
</html>
</richcontent>
</node>
<node ID="ID_9" POSITION="left" STYLE="fork" TEXT="Falar que a escolha das categorias de sucess&#227;o e dos par&#226;metros ou caracter&#237;stica dos indiv&#237;duos que ser&#227;o utilizadas dependera da facilidade de coleta dos dados e do custo monet&#225;rio e temporal."/>
<node ID="ID_12" POSITION="left" STYLE="fork" TEXT="Ver se classifica sucess&#227;o por densidade de tronco para citar no artigo como exemplo de outros atributos al&#233;m de germina&#231;&#227;o e ver se e custoso no tempo e em dinheiro"/>
<node ID="ID_13" POSITION="left" STYLE="fork" TEXT="Intensas amostragens de experimentos simples tem maior retorno em acur&#225;cia de estimativa e de custo tb."/>
<node ID="ID_14" POSITION="left" STYLE="fork">
<richcontent TYPE="NODE">
<html>
<head/>
<body>
<p>With regard to estimating mean trait values, strategies</p>
<p>alternative to BRIDGE were consistently cost-effective. On</p>
<p>the other hand, strategies alternative to BRIDGE clearly</p>
<p>failed to accurately estimate the variance of trait values. This</p>
<p>indicates that in situations where accurate estimation of plotlevel</p>
<p>variance is desired, complete censuses are essential.</p>
</body>
</html>
</richcontent>
<richcontent TYPE="NOTE">
<html>
<head/>
<body>
<p/>
<p>Isso significa que estudos de caracter&#237;stica de hist&#243;ria de vida compensam? Ver nos m&amp;m.</p>
</body>
</html>
</richcontent>
</node>
<node ID="ID_15" POSITION="left" STYLE="fork">
<richcontent TYPE="NODE">
<html>
<head/>
<body>
<p>We suggest that, in these studies,</p>
<p>the investment in complete sampling may be worthwhile</p>
<p>for at least some traits.</p>
</body>
</html>
</richcontent>
<richcontent TYPE="NOTE">
<html>
<head/>
<body>
<p/>
<p>Falar que isso corrobora nossa sugest&#227;o de utilizar poucas medidas, mas que elas sejam confi&#225;veis.</p>
</body>
</html>
</richcontent>
</node>
</node>
</node>

File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show More