[Isocial-svn] SF.net SVN: isocial: [212]
Status: Pre-Alpha
Brought to you by:
aguidrevitch
Menu
▾
▴
[Isocial-svn] SF.net SVN: isocial: [212]
|
From: <agu...@us...> - 2008-05-18 18:09:47
|
Revision: 212
http://isocial.svn.sourceforge.net/isocial/?rev=212&view=rev
Author: aguidrevitch
Date: 2008-05-18 11:09:46 -0700 (Sun, 18 May 2008)
Log Message:
-----------
Contact, Relationships and Personal tabs in profile implemented
Modified Paths:
--------------
app/controllers/profile_controller.php
app/installers/russian_installer.php
app/installers/user_installer.php
app/locales/layout/ru.php
app/locales/profile/ru.php
app/models/basic_profile.php
app/models/user.php
app/views/groupapp/group/_customize.tpl
app/views/profile/contact.tpl
app/views/profile/personal.tpl
app/views/profile/relationships.tpl
public/stylesheets/common/Form.css
timesheet/aguidrevitch.txt
Added Paths:
-----------
app/models/im_profile.php
app/models/marital_status.php
app/models/personal_profile.php
app/models/relationship_profile.php
public/images/delete.png
Removed Paths:
-------------
app/locales/dialog/
Modified: app/controllers/profile_controller.php
===================================================================
--- app/controllers/profile_controller.php 2008-05-17 08:40:36 UTC (rev 211)
+++ app/controllers/profile_controller.php 2008-05-18 18:09:46 UTC (rev 212)
@@ -2,7 +2,7 @@
class ProfileController extends ApplicationController
{
- var $models = array('User', 'BasicProfile', 'Sex', 'Country', 'Region', 'City', 'PoliticalView', 'ReligiousView');
+ var $models = array('User', 'Sex', 'Country', 'Region', 'City', 'PoliticalView', 'ReligiousView', 'MaritalStatus');
function index () {
$this->redirectTo(array('action' => 'show'));
@@ -90,9 +90,23 @@
}
function relationships () {
+ $this->relationship_profile = $this->current_user->relationship_profile->load();
+ if ($this->Request->isPost() && !empty($this->params['relationship_profile'])) {
+ $this->relationship_profile->setAttributes($this->params['relationship_profile']);
+ if ($this->relationship_profile->save()) {
+ $this->redirectTo(array('action' => 'relationships'));
+ }
+ }
}
function personal () {
+ $this->personal_profile = $this->current_user->personal_profile->load();
+ if ($this->Request->isPost() && !empty($this->params['personal_profile'])) {
+ $this->personal_profile->setAttributes($this->params['personal_profile']);
+ if ($this->personal_profile->save()) {
+ $this->redirectTo(array('action' => 'personal'));
+ }
+ }
}
function groups () {
Modified: app/installers/russian_installer.php
===================================================================
--- app/installers/russian_installer.php 2008-05-17 08:40:36 UTC (rev 211)
+++ app/installers/russian_installer.php 2008-05-18 18:09:46 UTC (rev 212)
@@ -18,6 +18,14 @@
$this->execute("UPDATE political_views set {$locale}_name ='Безразличные' WHERE id = 6");
$this->execute("UPDATE political_views set {$locale}_name ='Философские' WHERE id = 7");
+ $this->execute("ALTER TABLE marital_statuses ADD COLUMN {$locale}_name char(30) NOT NULL AFTER en_name");
+ $this->execute("UPDATE marital_statuses set {$locale}_name ='Одинок(-а)' WHERE id = 1");
+ $this->execute("UPDATE marital_statuses set {$locale}_name ='Есть друг/подруга' WHERE id = 2");
+ $this->execute("UPDATE marital_statuses set {$locale}_name ='Обручен(-a)' WHERE id = 3");
+ $this->execute("UPDATE marital_statuses set {$locale}_name ='Женат/Замужем' WHERE id = 4");
+ $this->execute("UPDATE marital_statuses set {$locale}_name ='Сложно объяснить' WHERE id = 5");
+ $this->execute("UPDATE marital_statuses set {$locale}_name ='В открытых взаимоотношениях' WHERE id = 6");
+
}
function down_1()
Modified: app/installers/user_installer.php
===================================================================
--- app/installers/user_installer.php 2008-05-17 08:40:36 UTC (rev 211)
+++ app/installers/user_installer.php 2008-05-18 18:09:46 UTC (rev 212)
@@ -106,7 +106,7 @@
$this->execute(
"CREATE TRIGGER c_delete AFTER DELETE ON city_votes
FOR EACH ROW BEGIN
- UPDATE `cities` SET votes = votes - 1 WHERE id = NEW.city_id;
+ UPDATE `cities` SET votes = votes - 1 WHERE id = OLD.city_id;
END;
");
@@ -219,15 +219,69 @@
FOREIGN KEY (user_id) REFERENCES users(id),
INDEX user_idx (user_id)
) ENGINE=InnoDB");
+
+ $this->execute(
+ "CREATE TABLE `marital_statuses` (
+ `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ `en_name` char(30)
+ ) ENGINE=InnoDB");
+
+ $this->execute("INSERT INTO marital_statuses (id, en_name) VALUES (1, 'Single')");
+ $this->execute("INSERT INTO marital_statuses (id, en_name) VALUES (2, 'In a relationship')");
+ $this->execute("INSERT INTO marital_statuses (id, en_name) VALUES (3, 'Engaged')");
+ $this->execute("INSERT INTO marital_statuses (id, en_name) VALUES (4, 'Married')");
+ $this->execute("INSERT INTO marital_statuses (id, en_name) VALUES (5, 'It\'s complicated')");
+ $this->execute("INSERT INTO marital_statuses (id, en_name) VALUES (6, 'In an open relationship')");
+
+ $this->execute(
+ "CREATE TABLE `relationship_profiles` (
+ `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ `user_id` int(11) NOT NULL,
+ `marital_status_id` int(11) NOT NULL,
+
+ `interested_in_men` bool,
+ `interested_in_women` bool,
+ `looking_for_friendship` bool,
+ `looking_for_dating` bool,
+ `looking_for_relationship` bool,
+ `looking_for_networking` bool,
+
+ `created_at` datetime NOT NULL,
+ `updated_at` datetime NOT NULL,
+ FOREIGN KEY (user_id) REFERENCES users(id),
+ FOREIGN KEY (marital_status_id) REFERENCES marital_statuses(id),
+ INDEX user_idx (user_id)
+ ) ENGINE=InnoDB");
+
+ $this->execute(
+ "CREATE TABLE `personal_profiles` (
+ `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ `user_id` int(11) NOT NULL,
+ `activities` text,
+ `interests` text,
+ `music` text,
+ `tv_shows` text,
+ `movies` text,
+ `books` text,
+ `quotes` text,
+ `about` text,
+ `created_at` datetime NOT NULL,
+ `updated_at` datetime NOT NULL,
+ FOREIGN KEY (user_id) REFERENCES users(id),
+ INDEX user_idx (user_id)
+ ) ENGINE=InnoDB");
}
function down_1()
{
+
+ $this->transactionComplete();
+ $this->dropTable('personal_profiles');
+ $this->dropTable('marital_statuses');
+ $this->dropTable('relationship_profiles');
$this->dropTable('im_profiles');
$this->dropTable('contact_profiles');
$this->dropTable('basic_profiles');
- // triggers should be dropped automatically
- // http://dev.mysql.com/doc/refman/5.1/en/drop-trigger.html
$this->dropTable('religious_view_votes');
$this->dropTable('religious_views');
$this->dropTable('political_views');
@@ -241,6 +295,20 @@
$this->dropTable('confirmations');
$this->dropTable('users');
}
+
+ function dropTable($table_name, $options = array())
+ {
+ if($this->tableExists($table_name)){
+ $result = $this->db->execute('DROP TABLE '.$table_name);
+ if ($result) {
+ unset($this->available_tables[array_search($table_name, $this->available_tables)]);
+ if(!empty($options['sequence'])){
+ $this->dropSequence($table_name);
+ }
+ }
+ }
+ }
+
}
?>
Modified: app/locales/layout/ru.php
===================================================================
--- app/locales/layout/ru.php 2008-05-17 08:40:36 UTC (rev 211)
+++ app/locales/layout/ru.php 2008-05-18 18:09:46 UTC (rev 212)
@@ -30,7 +30,23 @@
$dictionary['GroupApp'] = 'Группы';
$dictionary['EventApp'] = 'События';
+$dictionary['Add another screen name'] = 'Добавить ещё один';
+$dictionary['Add New City'] = 'Добавить новый город';
+$dictionary['Select Country:'] = 'Выберите страну:';
+$dictionary['City Name'] = 'Город';
+$dictionary['Country'] = 'Страна';
+$dictionary['Region'] = 'Область';
+$dictionary['Who can see this?'] = 'Кто может видеть?';
+$dictionary['Everyone'] = 'Все';
+$dictionary['Friends of Friends'] = 'Друзья друзей';
+$dictionary['Only Friends'] = 'Только друзья';
+$dictionary['Only Me'] = 'Никто';
+$dictionary['Email field'] = 'Email адрес';
+$dictionary['Mobile Phone field'] = 'Номер мобильного телефона';
+$dictionary['Land Phone field'] = 'Номер домашнего телефона';
+$dictionary['Address field'] = 'Домашний адрес';
+$dictionary['Website field'] = 'URL веб сайта';
?>
Modified: app/locales/profile/ru.php
===================================================================
--- app/locales/profile/ru.php 2008-05-17 08:40:36 UTC (rev 211)
+++ app/locales/profile/ru.php 2008-05-18 18:09:46 UTC (rev 212)
@@ -26,18 +26,25 @@
$dictionary['Only my friends'] = 'Только для друзей';
$dictionary['Emails'] = 'Адреса Email';
-$dictionary['IM Screen Name(s)'] = 'IM';
+$dictionary['IM Screen Name(s)'] = 'Службы мгновенных сообщений';
$dictionary['Mobile phone'] = 'Мобильный номер';
$dictionary['Land phone'] = 'Домашний номер';
$dictionary['City'] = 'Город';
$dictionary['Address'] = 'Адрес';
$dictionary['Website'] = 'Веб сайт';
-$dictionary['Relationship status'] = 'Семейное положение';
+$dictionary['Relationship Status'] = 'Семейное положение';
$dictionary['Select Status:'] = 'Выберите положение:';
$dictionary['Former Name'] = 'Девичья фамилия';
+$dictionary['<strong>Note</strong>: Please enter a full name. Former Name is only used to help people find you in search and will not show up in your profile.'] = '<strong>Обратите внимание</strong>: Введите это поле если вы меняли фамилию. Девичья фамилия не видна в вашем профайле, однако используется при поиске.';
$dictionary['Interested In'] = 'Ищу';
+$dictionary['Men'] = 'Мужчину';
+$dictionary['Women'] = 'Женщину';
$dictionary['Looking for'] = 'Для';
+$dictionary['Friendship'] = 'Дружбы';
+$dictionary['Dating'] = 'Знакомства';
+$dictionary['A Relationship'] = 'Серьёзных отношений';
+$dictionary['Networking'] = 'Налаживания связей';
$dictionary['Activities'] = 'Род занятий';
$dictionary['Interests'] = 'Интересы';
Modified: app/models/basic_profile.php
===================================================================
--- app/models/basic_profile.php 2008-05-17 08:40:36 UTC (rev 211)
+++ app/models/basic_profile.php 2008-05-18 18:09:46 UTC (rev 212)
@@ -2,7 +2,7 @@
class BasicProfile extends ActiveRecord
{
- var $belongs_to = array('User', 'City', 'PoliticalView', 'ReligiousView');
+ var $belongs_to = array('User', 'City', 'PoliticalView', 'ReligiousView', 'Sex');
}
?>
Added: app/models/im_profile.php
===================================================================
--- app/models/im_profile.php (rev 0)
+++ app/models/im_profile.php 2008-05-18 18:09:46 UTC (rev 212)
@@ -0,0 +1,8 @@
+<?php
+
+class ImProfile extends ActiveRecord
+{
+ var $belongs_to = array('User');
+}
+
+?>
Added: app/models/marital_status.php
===================================================================
--- app/models/marital_status.php (rev 0)
+++ app/models/marital_status.php 2008-05-18 18:09:46 UTC (rev 212)
@@ -0,0 +1,7 @@
+<?php
+
+class MaritalStatus extends ActiveRecord
+{
+}
+
+?>
Added: app/models/personal_profile.php
===================================================================
--- app/models/personal_profile.php (rev 0)
+++ app/models/personal_profile.php 2008-05-18 18:09:46 UTC (rev 212)
@@ -0,0 +1,8 @@
+<?php
+
+class PersonalProfile extends ActiveRecord
+{
+ var $belongs_to = array('User');
+}
+
+?>
Added: app/models/relationship_profile.php
===================================================================
--- app/models/relationship_profile.php (rev 0)
+++ app/models/relationship_profile.php 2008-05-18 18:09:46 UTC (rev 212)
@@ -0,0 +1,8 @@
+<?php
+
+class RelationshipProfile extends ActiveRecord
+{
+ var $belongs_to = array('User');
+}
+
+?>
Modified: app/models/user.php
===================================================================
--- app/models/user.php 2008-05-17 08:40:36 UTC (rev 211)
+++ app/models/user.php 2008-05-18 18:09:46 UTC (rev 212)
@@ -14,7 +14,7 @@
'foreign_key' => 'user_id'),
);
- var $has_one = array('BasicProfile', 'ContactProfile');
+ var $has_one = array('BasicProfile', 'ContactProfile', 'RelationshipProfile', 'PersonalProfile');
function login($email, $password) {
return $this->findFirst(array( 'email' => $email, 'password' => md5($password) ));
Modified: app/views/groupapp/group/_customize.tpl
===================================================================
--- app/views/groupapp/group/_customize.tpl 2008-05-17 08:40:36 UTC (rev 211)
+++ app/views/groupapp/group/_customize.tpl 2008-05-18 18:09:46 UTC (rev 212)
@@ -15,7 +15,7 @@
<div class="formrow">
<label>_{Options}:</label>
<div class="formcol">
- <label class="checkbox"><?= $form_helper->check_box('group', 'show_related_groups', array('class' => 'checkboxinput')) ?> _{Show related groups}.</label>
+ <label class="checkbox"><?= $form_helper->check_box('group', 'show_related_groups', array('class' => 'checkboxinput')) ?>_{Show related groups}.</label>
</div>
<div class="clearfix"></div>
</div>
@@ -23,7 +23,7 @@
<div class="formrow">
<label> </label>
<div class="formcol">
- <label class="checkbox"><?= $form_helper->check_box('group', 'show_discussion_board', array('class' => 'checkboxinput')) ?> _{Enable discussion board}.</label>
+ <label class="checkbox"><?= $form_helper->check_box('group', 'show_discussion_board', array('class' => 'checkboxinput')) ?>_{Enable discussion board}.</label>
</div>
<div class="clearfix"></div>
</div>
@@ -31,7 +31,7 @@
<div class="formrow">
<label> </label>
<div class="formcol">
- <label class="checkbox"><?= $form_helper->check_box('group', 'show_wall', array('class' => 'checkboxinput')) ?> _{Enable the Wall}.</label>
+ <label class="checkbox"><?= $form_helper->check_box('group', 'show_wall', array('class' => 'checkboxinput')) ?>_{Enable the Wall}.</label>
</div>
<div class="clearfix"></div>
</div>
@@ -39,7 +39,7 @@
<div class="formrow">
<label> </label>
<div class="formcol">
- <label class="checkbox"><?= $form_helper->check_box('group', 'show_photos', array('class' => 'checkboxinput')) ?> _{Enable photos}.</label>
+ <label class="checkbox"><?= $form_helper->check_box('group', 'show_photos', array('class' => 'checkboxinput')) ?>_{Enable photos}.</label>
</div>
<div class="clearfix"></div>
</div>
@@ -47,8 +47,8 @@
<label> </label>
<div class="formcol">
<div class="formblock border">
- <label class="radiobutton"><?= $form_helper->radio_button('group', 'photo_member', '0', array('checked' => 'checked')) ?> _{Allow all members to upload photos}.</label>
- <label class="radiobutton"><?= $form_helper->radio_button('group', 'photo_member', '1') ?> _{Only allow admins to upload photos}.</label>
+ <label class="radiobutton"><?= $form_helper->radio_button('group', 'photo_member', '0', array('checked' => 'checked', 'class' => 'radioinput')) ?>_{Allow all members to upload photos}.</label>
+ <label class="radiobutton"><?= $form_helper->radio_button('group', 'photo_member', '1', array('class' => 'radioinput')) ?>_{Only allow admins to upload photos}.</label>
<div class="clearfix"></div>
</div>
</div>
@@ -58,7 +58,7 @@
<div class="formrow">
<label> </label>
<div class="formcol">
- <label class="checkbox"><?= $form_helper->check_box('group', 'show_videos', array('class' => 'checkboxinput')) ?> _{Enable videos}.</label>
+ <label class="checkbox"><?= $form_helper->check_box('group', 'show_videos', array('class' => 'checkboxinput')) ?>_{Enable videos}.</label>
</div>
<div class="clearfix"></div>
</div>
@@ -66,8 +66,8 @@
<label> </label>
<div class="formcol">
<div class="formblock border">
- <label class="radiobutton"><?= $form_helper->radio_button('group', 'video_member', '0', array('checked' => 'checked')) ?> _{Allow all members to upload videos}.</label>
- <label class="radiobutton"><?= $form_helper->radio_button('group', 'video_member', '1') ?> _{Only allow admins to upload videos}.</label>
+ <label class="radiobutton"><?= $form_helper->radio_button('group', 'video_member', '0', array('checked' => 'checked', 'class' => 'radioinput')) ?>_{Allow all members to upload videos}.</label>
+ <label class="radiobutton"><?= $form_helper->radio_button('group', 'video_member', '1', array('class' => 'radioinput')) ?>_{Only allow admins to upload videos}.</label>
<div class="clearfix"></div>
</div>
</div>
@@ -77,7 +77,7 @@
<div class="formrow">
<label>_{Access}:</label>
<div class="formcol">
- <label class="radiobutton"><?= $form_helper->radio_button('group', 'access', '0', array('checked' => 'checked')) ?> _{This group is open}.</label>
+ <label class="radiobutton"><?= $form_helper->radio_button('group', 'access', '0', array('checked' => 'checked', 'class' => 'radioinput')) ?>_{This group is open}.</label>
</div>
<div class="clearfix"></div>
</div>
@@ -94,7 +94,7 @@
<div class="formrow">
<label> </label>
<div class="formcol">
- <label class="radiobutton"><?= $form_helper->radio_button('group', 'access', '1') ?> _{This group is closed}.</label>
+ <label class="radiobutton"><?= $form_helper->radio_button('group', 'access', '1', array('class' => 'radioinput')) ?>_{This group is closed}.</label>
</div>
<div class="clearfix"></div>
</div>
@@ -111,7 +111,7 @@
<div class="formrow">
<label> </label>
<div class="formcol">
- <label class="radiobutton"><?= $form_helper->radio_button('group', 'access', '2') ?> _{This group is secret}.</label>
+ <label class="radiobutton"><?= $form_helper->radio_button('group', 'access', '2', array('class' => 'radioinput')) ?>_{This group is secret}.</label>
</div>
<div class="clearfix"></div>
</div>
@@ -128,7 +128,7 @@
<div class="formrow">
<label>_{Publicize}:</label>
<div class="formcol">
- <label class="checkbox"><?= $form_helper->check_box('group', 'show_in_search', array('class' => 'checkboxinput', 'checked' => 'checked')) ?> _{Show this group in search results}.</label>
+ <label class="checkbox"><?= $form_helper->check_box('group', 'show_in_search', array('class' => 'checkboxinput', 'checked' => 'checked')) ?>_{Show this group in search results}.</label>
</div>
<div class="clearfix"></div>
</div>
Modified: app/views/profile/contact.tpl
===================================================================
--- app/views/profile/contact.tpl 2008-05-17 08:40:36 UTC (rev 211)
+++ app/views/profile/contact.tpl 2008-05-18 18:09:46 UTC (rev 212)
@@ -89,7 +89,7 @@
<label></label>
<div class="formcol">
<div class="middle">
- <a href="#" onclick='add_im()'>Add another screen name</a>
+ <a href="#" onclick='add_im()'>_{Add another screen name}</a>
</div>
</div>
</div>
Modified: app/views/profile/personal.tpl
===================================================================
--- app/views/profile/personal.tpl 2008-05-17 08:40:36 UTC (rev 211)
+++ app/views/profile/personal.tpl 2008-05-18 18:09:46 UTC (rev 212)
@@ -6,42 +6,42 @@
<div class="editform">
<div class="formrow">
<label>_{Activities}:</label>
- <?= $form_helper->text_area('personal', 'activities')?>
+ <?= $form_helper->text_area('personal_profile', 'activities')?>
</div>
<div class="formrow">
<label>_{Interests}:</label>
- <?= $form_helper->text_area('personal', 'interests')?>
+ <?= $form_helper->text_area('personal_profile', 'interests')?>
</div>
<div class="formrow">
<label>_{Favorite Music}:</label>
- <?= $form_helper->text_area('personal', 'music')?>
+ <?= $form_helper->text_area('personal_profile', 'music')?>
</div>
<div class="formrow">
<label>_{Favorite TV Shows}:</label>
- <?= $form_helper->text_area('personal', 'tv_shows')?>
+ <?= $form_helper->text_area('personal_profile', 'tv_shows')?>
</div>
<div class="formrow">
<label>_{Favorite Movies}:</label>
- <?= $form_helper->text_area('personal', 'movies')?>
+ <?= $form_helper->text_area('personal_profile', 'movies')?>
</div>
<div class="formrow">
<label>_{Favorite Books}:</label>
- <?= $form_helper->text_area('personal', 'books')?>
+ <?= $form_helper->text_area('personal_profile', 'books')?>
</div>
<div class="formrow">
<label>_{Favorite Quotes}:</label>
- <?= $form_helper->text_area('personal', 'quotes')?>
+ <?= $form_helper->text_area('personal_profile', 'quotes')?>
</div>
<div class="formrow">
<label>_{About me}:</label>
- <?= $form_helper->text_area('personal', 'about')?>
+ <?= $form_helper->text_area('personal_profile', 'about')?>
</div>
<div class="formrow">
Modified: app/views/profile/relationships.tpl
===================================================================
--- app/views/profile/relationships.tpl 2008-05-17 08:40:36 UTC (rev 211)
+++ app/views/profile/relationships.tpl 2008-05-18 18:09:46 UTC (rev 212)
@@ -7,16 +7,22 @@
<div class="formrow">
<label>_{Relationship Status}:</label>
<div class="formcol">
- <?= $form_options_helper->select('relationship', 'status', array('Single', 'In a relationship', 'Engaged', 'Married', 'It\'s complicated', 'In an open relationship'), array(), array('prompt' => $controller->t('Select Status:')) )?>
+ <?= $form_options_helper->select('relationship_profile', 'marital_status_id', $MaritalStatus->collect($MaritalStatus->find(), 'name', 'id'), array(), array('prompt' => $controller->t('Select Status:')) )?>
</div>
</div>
+ <?
+ $current_user->basic_profile->load();
+ $current_user->basic_profile->sex->load();
+ if ($current_user->basic_profile->sex->getId() == 2) {
+ ?>
<div class="formrow">
<label>_{Former Name}:</label>
<div class="formcol">
- <?= $form_helper->text_field('relationship', 'former_name', array('class' => 'textinput') )?>
+ <?= $form_helper->text_field('relationship_profile', 'former_name', array('class' => 'textinput') )?>
</div>
</div>
+
<div class="formrow">
<label></label>
<div class="formcol">
@@ -25,28 +31,54 @@
</div>
</div>
</div>
+ <?
+ }
+ ?>
<div class="formrow">
<label>_{Interested In}:</label>
<div class="formcol">
- <label class="checkbox"><?= $form_helper->check_box('relationship', 'interested_in_men', array('class' => 'checkboxinput')) ?> Men</label>
- <label class="checkbox"><?= $form_helper->check_box('relationship', 'interested_in_women', array('class' => 'checkboxinput')) ?> Women</label>
+ <label class="checkbox"><?= $form_helper->check_box('relationship_profile', 'interested_in_men', array('class' => 'checkboxinput')) ?>_{Men}</label>
</div>
</div>
<div class="formrow">
+ <label></label>
+ <div class="formcol">
+ <label class="checkbox"><?= $form_helper->check_box('relationship_profile', 'interested_in_women', array('class' => 'checkboxinput')) ?>_{Women}</label>
+ </div>
+ </div>
+
+ <div class="formrow">
<label>_{Looking for}:</label>
<div class="formcol">
- <label class="checkbox"><?= $form_helper->check_box('relationship', 'looking_for_friendship', array('class' => 'checkboxinput')) ?> Friendship</label>
- <label class="checkbox"><?= $form_helper->check_box('relationship', 'looking_for_dating', array('class' => 'checkboxinput')) ?> Dating</label>
- <label class="checkbox"><?= $form_helper->check_box('relationship', 'looking_for_relationship', array('class' => 'checkboxinput')) ?> A Relationship</label>
- <label class="checkbox"><?= $form_helper->check_box('relationship', 'looking_for_networking', array('class' => 'checkboxinput')) ?> Networking</label>
+ <label class="checkbox"><?= $form_helper->check_box('relationship_profile', 'looking_for_friendship', array('class' => 'checkboxinput')) ?>_{Friendship}</label>
</div>
</div>
+ <div class="formrow">
+ <label></label>
+ <div class="formcol">
+ <label class="checkbox"><?= $form_helper->check_box('relationship_profile', 'looking_for_dating', array('class' => 'checkboxinput')) ?>_{Dating}</label>
+ </div>
+ </div>
<div class="formrow">
<label></label>
+ <div class="formcol">
+ <label class="checkbox"><?= $form_helper->check_box('relationship_profile', 'looking_for_relationship', array('class' => 'checkboxinput')) ?>_{A Relationship}</label>
+ </div>
+ </div>
+
+ <div class="formrow">
+ <label></label>
+ <div class="formcol">
+ <label class="checkbox"><?= $form_helper->check_box('relationship_profile', 'looking_for_networking', array('class' => 'checkboxinput')) ?>_{Networking}</label>
+ </div>
+ </div>
+
+ <div class="formrow">
+ <label></label>
<input class="submitinput" type="submit" value="_{Save Changes}">
<input class="cancelinput" type="button" value="_{Cancel}">
</div>
Added: public/images/delete.png
===================================================================
(Binary files differ)
Property changes on: public/images/delete.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: public/stylesheets/common/Form.css
===================================================================
--- public/stylesheets/common/Form.css 2008-05-17 08:40:36 UTC (rev 211)
+++ public/stylesheets/common/Form.css 2008-05-18 18:09:46 UTC (rev 212)
@@ -45,6 +45,7 @@
width: 400px;
}
+
.formrow label.radiobutton {
font-weight: normal;
color: #000000;
@@ -53,6 +54,10 @@
width: 400px;
}
+.formrow label.checkbox .checkboxinput, .formrow label.radiobutton .radioinput {
+ margin-right: 6px;
+}
+
.formrow label.required {
line-height: 10px;
}
Modified: timesheet/aguidrevitch.txt
===================================================================
--- timesheet/aguidrevitch.txt 2008-05-17 08:40:36 UTC (rev 211)
+++ timesheet/aguidrevitch.txt 2008-05-18 18:09:46 UTC (rev 212)
@@ -10,3 +10,4 @@
2008-05-13,20:40,21:20,main,RT:1,"fixing IE6 compatibility issues for dialog, minor fixes to city dialog"
2008-05-14,19:10,22:00,main,RT:1,"instant messagers profile"
2008-05-15,20:40,22:10,main,RT:1,"instant messagers profile implemented"
+2008-05-18,18:00,21:10,main,RT:1,"relationships and personal tabs implemented"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|