[Isocial-svn] SF.net SVN: isocial: [37] public/stylesheets
Status: Pre-Alpha
Brought to you by:
aguidrevitch
From: <agu...@us...> - 2008-03-03 18:03:25
|
Revision: 37 http://isocial.svn.sourceforge.net/isocial/?rev=37&view=rev Author: aguidrevitch Date: 2008-03-03 10:02:41 -0800 (Mon, 03 Mar 2008) Log Message: ----------- profile editing stubs added, minor css updates Modified Paths: -------------- akelos.diff app/controllers/default_controller.php app/controllers/user_controller.php app/locales/layout/en.php app/locales/layout/ru.php app/views/default/index.tpl app/views/message/_menu.tpl app/views/message/send.tpl app/views/shared/loggedin/compiled/sidebar.tpl.php app/views/shared/loggedin/pageheader.tpl app/views/shared/loggedin/sidebar.tpl app/views/user/forgot_password.tpl app/views/user/laststep.tpl app/views/user/login.tpl app/views/user/register.tpl app/views/user/reset_password.tpl app/views/user/thankyou.tpl public/stylesheets/Application.css public/stylesheets/Default.css public/stylesheets/Message.css public/stylesheets/User.css Added Paths: ----------- app/controllers/profile_controller.php app/installers/basic_profile_installer.php app/installers/country_installer.php app/installers/political_view_installer.php app/installers/sex_installer.php app/locales/profile/ app/locales/profile/en.php app/locales/profile/ru.php app/models/country.php app/models/political_view.php app/models/sex.php app/views/default/_sidebar.tpl app/views/profile/ app/views/profile/_menu.tpl app/views/profile/basic.tpl app/views/profile/contact.tpl app/views/profile/groups.tpl app/views/profile/index.tpl app/views/profile/personal.tpl app/views/profile/picture.tpl app/views/profile/relationships.tpl public/images/group.png public/images/lock.png public/images/magnifier.png public/images/photo.png public/stylesheets/Profile.css Modified: akelos.diff =================================================================== --- akelos.diff 2008-02-29 16:43:08 UTC (rev 36) +++ akelos.diff 2008-03-03 18:02:41 UTC (rev 37) @@ -1,6 +1,6 @@ Index: lib/Ak.php =================================================================== ---- lib/Ak.php (revision 478) +--- lib/Ak.php (revision 500) +++ lib/Ak.php (working copy) @@ -186,6 +186,11 @@ return @$string[$try_whith_lang]; @@ -23,3 +23,16 @@ }else { $string = isset($framework_dictionary[$string]) ? $framework_dictionary[$string] : $string; } +Index: lib/AkActiveRecord.php +=================================================================== +--- lib/AkActiveRecord.php (revision 500) ++++ lib/AkActiveRecord.php (working copy) +@@ -4721,7 +4721,7 @@ + $resulting_array = array(); + if(!empty($source_array) && is_array($source_array)) { + foreach ($source_array as $source_item){ +- $resulting_array[$source_item->get($key_index)] = $source_item->get($value_index); ++ $resulting_array[$source_item->get($key_index, false)] = $source_item->get($value_index, false); + } + } + return $resulting_array; Modified: app/controllers/default_controller.php =================================================================== --- app/controllers/default_controller.php 2008-02-29 16:43:08 UTC (rev 36) +++ app/controllers/default_controller.php 2008-03-03 18:02:41 UTC (rev 37) @@ -14,7 +14,7 @@ function renderSidebar() { - return $this->renderShared("default/sidebar"); + return $this->renderPartial("sidebar"); } function renderPageHeader() Added: app/controllers/profile_controller.php =================================================================== --- app/controllers/profile_controller.php (rev 0) +++ app/controllers/profile_controller.php 2008-03-03 18:02:41 UTC (rev 37) @@ -0,0 +1,30 @@ +<?php + +class ProfileController extends ApplicationController +{ + var $models = 'user, basic_profile, sex, country, political_view'; + + function index () { + } + + function basic () { + } + + function contact () { + } + + function relationships () { + } + + function personal () { + } + + function groups () { + } + + function picture () { + } + +} + +?> \ No newline at end of file Modified: app/controllers/user_controller.php =================================================================== --- app/controllers/user_controller.php 2008-02-29 16:43:08 UTC (rev 36) +++ app/controllers/user_controller.php 2008-03-03 18:02:41 UTC (rev 37) @@ -80,8 +80,8 @@ if ($confirmation->uuid == $this->params['uuid']) { $user->active = 1; if ($user->save()) { + $confirmation->destroy(); $this->sendMail($user->email); - $confirmation->destroy(); return; } } Added: app/installers/basic_profile_installer.php =================================================================== --- app/installers/basic_profile_installer.php (rev 0) +++ app/installers/basic_profile_installer.php 2008-03-03 18:02:41 UTC (rev 37) @@ -0,0 +1,33 @@ +<?php +class BasicProfileInstaller extends AkInstaller +{ + function up_1() + { + $this->execute( + "CREATE TABLE `basic_profiles` ( + `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT, + `user_id` int(11) NOT NULL, + `sex_id` int(11), + `country_id` int(11), + `hometown` char(255) NOT NULL DEFAULT '', + `birthdate` datetime DEFAULT NULL, + `political_view_id` int(11), + `created_at` datetime NOT NULL, + `updated_at` datetime NOT NULL, + FOREIGN KEY (user_id) REFERENCES users(id), + FOREIGN KEY (sex_id) REFERENCES sexes(id), + FOREIGN KEY (country_id) REFERENCES countries(id), + FOREIGN KEY (political_view_id) REFERENCES political_views(id) + ) ENGINE=InnoDB"); + + } + + function down_1() + { + /**/ + $this->dropTable('basic_profiles'); + /**/ + } +} + +?> Added: app/installers/country_installer.php =================================================================== --- app/installers/country_installer.php (rev 0) +++ app/installers/country_installer.php 2008-03-03 18:02:41 UTC (rev 37) @@ -0,0 +1,269 @@ +<?php +class CountryInstaller extends AkInstaller +{ + function up_1() + { + $this->execute( + "CREATE TABLE `countries` ( + `id` int(11) PRIMARY KEY + ) ENGINE=InnoDB"); + + $fields = array(); + foreach (Ak::langs() as $lang) { + $fields[] = $lang . "_name"; + $this->execute("ALTER TABLE countries ADD column ${lang}_name char(255) NOT NULL DEFAULT \"\""); + } + $fields = join(", ", $fields); + + foreach (array(1 => "Åland Islands", + 2 => "Afghanistan", + 3 => "Albania", + 4 => "Algeria", + 5 => "American Samoa", + 6 => "Andorra", + 7 => "Angola", + 8 => "Anguilla", + 9 => "Antigua and Barbuda", + 10 => "Argentina", + 11 => "Armenia", + 12 => "Aruba", + 13 => "Australia", + 14 => "Austria", + 15 => "Azerbaijan", + 16 => "Bahamas", + 17 => "Bahrain", + 18 => "Bangladesh", + 19 => "Barbados", + 20 => "Belarus", + 21 => "Belgium", + 22 => "Belize", + 23 => "Benin", + 24 => "Bermuda", + 25 => "Bhutan", + 26 => "Bolivia", + 27 => "Bosnia and Herzegovina", + 28 => "Botswana", + 29 => "Brazil", + 30 => "British Virgin Islands", + 31 => "Brunei Darussalam", + 32 => "Bulgaria", + 33 => "Burkina Faso", + 34 => "Burundi", + 35 => "Côte d'Ivoire", + 36 => "Cambodia", + 37 => "Cameroon", + 38 => "Canada", + 39 => "Cape Verde", + 40 => "Cayman Islands", + 41 => "Central African Republic", + 42 => "Chad", + 43 => "Chile", + 44 => "China", + 45 => "Colombia", + 46 => "Comoros", + 47 => "Congo, Democratic Republic", + 48 => "Congo", + 49 => "Cook Islands", + 50 => "Costa Rica", + 51 => "Croatia", + 52 => "Cuba", + 53 => "Cyprus", + 54 => "Czech Republic", + 55 => "Denmark", + 56 => "Djibouti", + 57 => "Dominican Republic", + 58 => "Dominica", + 59 => "Ecuador", + 60 => "Egypt", + 61 => "El Salvador", + 62 => "Equatorial Guinea", + 63 => "Eritrea", + 64 => "Estonia", + 65 => "Ethiopia", + 66 => "Faeroe Islands", + 67 => "Falkland Islands (Malvinas)", + 68 => "Fiji", + 69 => "Finland", + 70 => "France", + 71 => "French Guiana", + 72 => "French Polynesia", + 73 => "Gabon", + 74 => "Gambia", + 75 => "Georgia", + 76 => "Germany", + 77 => "Ghana", + 78 => "Gibraltar", + 79 => "Greece", + 80 => "Greenland", + 81 => "Grenada", + 82 => "Guadeloupe", + 83 => "Guam", + 84 => "Guatemala", + 85 => "Guinea-Bissau", + 86 => "Guinea", + 87 => "Guyana", + 88 => "Haiti", + 89 => "Honduras", + 90 => "Hong Kong", + 91 => "Hungary", + 92 => "Iceland", + 93 => "India", + 94 => "Indonesia", + 95 => "Iran (Islamic Republic of)", + 96 => "Iraq", + 97 => "Ireland", + 98 => "Isle of Man", + 99 => "Israel", + 100 => "Italy", + 101 => "Jamaica", + 102 => "Japan", + 103 => "Jordan", + 104 => "Kazakhstan", + 105 => "Kenya", + 106 => "Kiribati", + 107 => "Korea, Republic of", + 108 => "Korea, South", + 109 => "Kuwait", + 110 => "Kyrgyzstan", + 111 => "Lao People's Democratic Republic", + 112 => "Latvia", + 113 => "Lebanon", + 114 => "Lesotho", + 115 => "Liberia", + 116 => "Libyan Arab Jamahiriya", + 117 => "Liechtenstein", + 118 => "Lithuania", + 119 => "Luxembourg", + 120 => "Macao", + 121 => "Macedonia", + 122 => "Madagascar", + 123 => "Malawi", + 124 => "Malaysia", + 125 => "Maldives", + 126 => "Mali", + 127 => "Malta", + 128 => "Marshall Islands", + 129 => "Martinique", + 130 => "Mauritania", + 131 => "Mauritius", + 132 => "Mayotte", + 133 => "Mexico", + 134 => "Micronesia", + 135 => "Monaco", + 136 => "Mongolia", + 137 => "Montserrat", + 138 => "Morocco", + 139 => "Mozambique", + 140 => "Myanmar", + 141 => "Namibia", + 142 => "Nauru", + 143 => "Nepal", + 144 => "Netherlands Antilles", + 145 => "Netherlands", + 146 => "New Caledonia", + 147 => "New Zealand", + 148 => "Nicaragua", + 149 => "Nigeria", + 150 => "Niger", + 151 => "Niue", + 152 => "Norfolk Island", + 153 => "Northern Mariana Islands", + 154 => "Norway", + 155 => "Occupied Palestinian Territory", + 156 => "Oman", + 157 => "Pakistan", + 158 => "Palau", + 159 => "Panama", + 160 => "Papua New Guinea", + 161 => "Paraguay", + 162 => "Peru", + 163 => "Philippines", + 164 => "Pitcairn", + 165 => "Poland", + 166 => "Portugal", + 167 => "Puerto Rico", + 168 => "Qatar", + 169 => "Réunion", + 170 => "Republic of Moldova", + 171 => "Romania", + 172 => "Russian Federation", + 173 => "Rwanda", + 174 => "Saint Helena", + 175 => "Saint Kitts and Nevis", + 176 => "Saint Lucia", + 177 => "Saint Pierre and Miquelon", + 178 => "Saint Vincent and the Grenadines", + 179 => "Samoa", + 180 => "San Marino", + 181 => "Sao Tome and Principe", + 182 => "Saudi Arabia", + 183 => "Senegal", + 184 => "Serbia and Montenegro", + 185 => "Seychelles", + 186 => "Sierra Leone", + 187 => "Singapore", + 188 => "Slovakia", + 189 => "Slovenia", + 190 => "Solomon Islands", + 191 => "Somalia", + 192 => "South Africa", + 193 => "Spain", + 194 => "Sri Lanka", + 195 => "Sudan", + 196 => "Suriname", + 197 => "Svalbard and Jan Mayen Islands", + 198 => "Swaziland", + 199 => "Sweden", + 200 => "Switzerland", + 201 => "Syrian Arab Republic", + 202 => "Tajikistan", + 203 => "Tanzania", + 204 => "Thailand", + 205 => "Timor-Leste", + 206 => "Togo", + 207 => "Tokelau", + 208 => "Tonga", + 209 => "Trinidad and Tobago", + 210 => "Tunisia", + 211 => "Turkey", + 212 => "Turkmenistan", + 213 => "Turks and Caicos Islands", + 214 => "Tuvalu", + 215 => "Uganda", + 216 => "Ukraine", + 217 => "United Arab Emirates", + 218 => "United Kingdom", + 219 => "United States Virgin Islands", + 220 => "United States", + 221 => "Uruguay", + 222 => "Uzbekistan", + 223 => "Vanuatu", + 224 => "Vatican City State (Holy See)", + 225 => "Venezuela", + 226 => "Viet Nam", + 227 => "Wallis and Futuna Islands", + 228 => "Western Sahara", + 229 => "Yemen", + 230 => "Zambia", + 231 => "Zimbabwe") as $id => $country) + { + + $values = array(); + foreach (Ak::langs() as $lang) { + Ak::lang($lang); + $values[] = '"' . Ak::t($country) . '"'; + } + $values = join(", ", $values); + $this->execute("INSERT INTO countries (id, $fields) VALUES ($id, $values)"); + } + } + + function down_1() + { + /**/ + $this->dropTable('countries'); + /**/ + } +} + +?> Added: app/installers/political_view_installer.php =================================================================== --- app/installers/political_view_installer.php (rev 0) +++ app/installers/political_view_installer.php 2008-03-03 18:02:41 UTC (rev 37) @@ -0,0 +1,46 @@ +<?php +class PoliticalViewInstaller extends AkInstaller +{ + function up_1() + { + $this->execute( + "CREATE TABLE `political_views` ( + `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT + ) ENGINE=InnoDB"); + + $fields = array(); + foreach (Ak::langs() as $lang) { + $fields[] = $lang . "_name"; + $this->execute("ALTER TABLE political_views ADD column ${lang}_name char(255) NOT NULL DEFAULT \"\""); + } + $fields = join(", ", $fields); + + foreach (array(1 => "Very Liberal", + 2 => "Liberal", + 3 => "Moderate", + 4 => "Conservative", + 5 => "Very Conservative", + 6 => "Apathetic", + 7 => "Libertarian", + ) as $id => $view) + { + + $values = array(); + foreach (Ak::langs() as $lang) { + Ak::lang($lang); + $values[] = '"' . Ak::t($view) . '"'; + } + $values = join(", ", $values); + $this->execute("INSERT INTO political_views (id, $fields) VALUES ($id, $values)"); + } + } + + function down_1() + { + /**/ + $this->dropTable('political_views'); + /**/ + } +} + +?> Added: app/installers/sex_installer.php =================================================================== --- app/installers/sex_installer.php (rev 0) +++ app/installers/sex_installer.php 2008-03-03 18:02:41 UTC (rev 37) @@ -0,0 +1,39 @@ +<?php +class SexInstaller extends AkInstaller +{ + function up_1() + { + $this->execute( + "CREATE TABLE `sexes` ( + `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT + ) ENGINE=InnoDB"); + + $fields = array(); + foreach (Ak::langs() as $lang) { + $fields[] = $lang . "_name"; + $this->execute("ALTER TABLE sexes ADD column ${lang}_name char(255) NOT NULL DEFAULT \"\""); + } + $fields = join(", ", $fields); + + foreach (array(1 => "Male", + 2 => "Female") as $id => $sex) + { + $values = array(); + foreach (Ak::langs() as $lang) { + Ak::lang($lang); + $values[] = '"' . Ak::t($sex) . '"'; + } + $values = join(", ", $values); + $this->execute("INSERT INTO sexes (id, $fields) VALUES ($id, $values)"); + } + } + + function down_1() + { + /**/ + $this->dropTable('sexes'); + /**/ + } +} + +?> Modified: app/locales/layout/en.php =================================================================== --- app/locales/layout/en.php 2008-02-29 16:43:08 UTC (rev 36) +++ app/locales/layout/en.php 2008-03-03 18:02:41 UTC (rev 37) @@ -16,4 +16,8 @@ $dictionary['Sign Up'] = 'Sign Up'; $dictionary['Everyone Can Join'] = 'Everyone Can Join'; + +$dictionary['PhotoApp'] = 'Photos'; +$dictionary['GroupApp'] = 'Groups'; + ?> Modified: app/locales/layout/ru.php =================================================================== --- app/locales/layout/ru.php 2008-02-29 16:43:08 UTC (rev 36) +++ app/locales/layout/ru.php 2008-03-03 18:02:41 UTC (rev 37) @@ -17,7 +17,14 @@ $dictionary['Everyone Can Join'] = 'Подключиться может каждый'; $dictionary['or'] = 'или'; $dictionary['Profile'] = 'Профиль'; +$dictionary['edit'] = 'настроить'; $dictionary['Friends'] = 'Друзья'; $dictionary['Messages'] = 'Сообщения'; +$dictionary['Save Changes'] = 'Сохранить'; +$dictionary['Cancel'] = 'Отмена'; + +$dictionary['PhotoApp'] = 'Фото'; +$dictionary['GroupApp'] = 'Группы'; + ?> Added: app/locales/profile/en.php =================================================================== --- app/locales/profile/en.php (rev 0) +++ app/locales/profile/en.php 2008-03-03 18:02:41 UTC (rev 37) @@ -0,0 +1,7 @@ +<?php + +// File created on: 2008-02-17 15:13:51 + +$dictionary = array(); + +?> Added: app/locales/profile/ru.php =================================================================== --- app/locales/profile/ru.php (rev 0) +++ app/locales/profile/ru.php 2008-03-03 18:02:41 UTC (rev 37) @@ -0,0 +1,47 @@ +<?php + +// File created on: 2008-02-17 15:13:51 + +$dictionary = array(); + +$dictionary['Basic'] = 'Основные'; +$dictionary['Contact'] = 'Контакты'; +$dictionary['Relationships'] = 'Семейное положение'; +$dictionary['Personal'] = 'Интересы'; +$dictionary['Groups'] = 'Группы'; +$dictionary['Picture'] = 'Фото'; + +$dictionary['Sex'] = 'Пол'; +$dictionary['Select Sex:'] = 'Выберите пол:'; + +$dictionary['Birthday'] = 'Дата рождения'; +$dictionary['Country'] = 'Страна'; +$dictionary['Select Country:'] = 'Выберите страну:'; +$dictionary['Hometown'] = 'Родной город'; + +$dictionary['Political views'] = 'Политические взгляды'; +$dictionary['Select Political Views:'] = 'Выберите политические взгляды:'; + +$dictionary['Religious views'] = 'Религия'; + +$dictionary['Only my friends'] = 'Только для друзей'; +$dictionary['Emails'] = 'Адреса Email'; +$dictionary['IM Screen Name(s)'] = 'IM'; +$dictionary['Mobile phone'] = 'Мобильный номер'; +$dictionary['Land phone'] = 'Домашний номер'; +$dictionary['City'] = 'Город'; +$dictionary['Address'] = 'Адрес'; +$dictionary['Website'] = 'Веб сайт'; + +$dictionary['Relationship status'] = 'Семейное положение'; +$dictionary['Select Status:'] = 'Выберите положение:'; +$dictionary['Former Name'] = 'Девичья фамилия'; +$dictionary['Interested In'] = 'Ищу'; +$dictionary['Looking for'] = 'Для'; + +$dictionary['Activities'] = 'Род занятий'; +$dictionary['Interests'] = 'Интересы'; +$dictionary['Favorite Music'] = 'Любимая музыка'; +$dictionary['Favorite TV Shows'] = 'Любимые ТВ шоу'; + +?> Added: app/models/country.php =================================================================== --- app/models/country.php (rev 0) +++ app/models/country.php 2008-03-03 18:02:41 UTC (rev 37) @@ -0,0 +1,7 @@ +<?php + +class Country extends ActiveRecord +{ +} + +?> Added: app/models/political_view.php =================================================================== --- app/models/political_view.php (rev 0) +++ app/models/political_view.php 2008-03-03 18:02:41 UTC (rev 37) @@ -0,0 +1,7 @@ +<?php + +class PoliticalView extends ActiveRecord +{ +} + +?> Added: app/models/sex.php =================================================================== --- app/models/sex.php (rev 0) +++ app/models/sex.php 2008-03-03 18:02:41 UTC (rev 37) @@ -0,0 +1,7 @@ +<?php + +class Sex extends ActiveRecord +{ +} + +?> Added: app/views/default/_sidebar.tpl =================================================================== --- app/views/default/_sidebar.tpl (rev 0) +++ app/views/default/_sidebar.tpl 2008-03-03 18:02:41 UTC (rev 37) @@ -0,0 +1,20 @@ +<div id="quicklogin"> + <form action="/user/login" method="post"> + <label> + <span>_{Email}:</span> + <input class="sidetextinput" type="text" name="email"> + </label> + <label> + <span>_{Password}:</span> + <input class="sidetextinput" type="password" name="password"> + </label> + <label class="persistent"> + <input class="checkboxinput" type="checkbox" name="remember_me"> + <span>_{Remember me}</span> + </label> + <input class="submitinput" type="submit" value="_{Login}"> + + </form> + + <a href="/user/forgot_password">_{Forgot Password?}</a> +</div> \ No newline at end of file Modified: app/views/default/index.tpl =================================================================== --- app/views/default/index.tpl 2008-02-29 16:43:08 UTC (rev 36) +++ app/views/default/index.tpl 2008-03-03 18:02:41 UTC (rev 37) @@ -1 +1,3 @@ +<p> <a class="linkbutton" href="/user/register"><div>_{Sign Up}</div></a> +</p> \ No newline at end of file Modified: app/views/message/_menu.tpl =================================================================== --- app/views/message/_menu.tpl 2008-02-29 16:43:08 UTC (rev 36) +++ app/views/message/_menu.tpl 2008-03-03 18:02:41 UTC (rev 37) @@ -1,7 +1,8 @@ <div class="tabs"> <div class="left"> <ul class="toggle_tabs"> - <li class="first"><a href="/message/inbox" class="<?= $controller->getActionName() == 'inbox' ? 'selected' : '' ?>">_{Inbox}</a></li><li><a href="/message/outbox" class="last <?= $controller->getActionName() == 'outbox' ? 'selected' : '' ?>">_{Outbox}</a></li> + <li class="first"><a href="/message/inbox" class="<?= $controller->getActionName() == 'inbox' ? 'selected' : '' ?>">_{Inbox}</a></li><? + ?><li><a href="/message/outbox" class="last <?= $controller->getActionName() == 'outbox' ? 'selected' : '' ?>">_{Outbox}</a></li> </ul> </div> <div class="right"> Modified: app/views/message/send.tpl =================================================================== --- app/views/message/send.tpl 2008-02-29 16:43:08 UTC (rev 36) +++ app/views/message/send.tpl 2008-03-03 18:02:41 UTC (rev 37) @@ -3,7 +3,7 @@ <?= $controller->renderErrors() ?> <form action="/message/send" method="post"> - <div class="messageform"> + <div class="editform"> <div class="formrow"> <label>_{To}:</label> <?= $form_helper->text_field('message', '', array('class' => 'textinput') )?> Added: app/views/profile/_menu.tpl =================================================================== --- app/views/profile/_menu.tpl (rev 0) +++ app/views/profile/_menu.tpl 2008-03-03 18:02:41 UTC (rev 37) @@ -0,0 +1,13 @@ +<div class="tabs"> + <div class="left"> + <ul class="toggle_tabs"> + <li class="first"> + <a href="/profile/basic" class="<?= $controller->getActionName() == 'basic' ? 'selected' : '' ?>">_{Basic}</a></li><? + ?><li><a href="/profile/contact" class="<?= $controller->getActionName() == 'contact' ? 'selected' : '' ?>">_{Contact}</a></li><? + ?><li><a href="/profile/relationships" class="<?= $controller->getActionName() == 'relationships' ? 'selected' : '' ?>">_{Relationships}</a></li><? + ?><li><a href="/profile/personal" class="<?= $controller->getActionName() == 'personal' ? 'selected' : '' ?>">_{Personal}</a></li><? + ?><li><a href="/profile/groups" class="<?= $controller->getActionName() == 'groups' ? 'selected' : '' ?>">_{Groups}</a></li><? + ?><li><a href="/profile/picture" class="last <?= $controller->getActionName() == 'picture' ? 'selected' : '' ?>">_{Picture}</a></li> + </ul> + </div> +</div> Added: app/views/profile/basic.tpl =================================================================== --- app/views/profile/basic.tpl (rev 0) +++ app/views/profile/basic.tpl 2008-03-03 18:02:41 UTC (rev 37) @@ -0,0 +1,38 @@ +<?= $controller->renderPartial("menu") ?> + +<?= $controller->renderErrors() ?> + +<form action="/profile/basic" method="post"> + <div class="editform"> + <div class="formrow"> + <label>_{Sex}:</label> + <?= $form_options_helper->select('basic', 'sex_id', $Sex->collect($Sex->find(), 'name', 'id'), array(), array('prompt' => $controller->t('Select Sex:')) )?> + </div> + <div class="formrow"> + <label>_{Birthday}:</label> + <?= $date_helper->date_select('basic', 'birthdate', array('start_year' => 1940) )?> + </div> + <div class="formrow"> + <label>_{Country}:</label> + <?= $form_options_helper->select('basic', 'country_id', $Country->collect($Country->find(), 'name', 'id'), array(), array('prompt' => $controller->t('Select Country:')) )?> + </div> + <div class="formrow"> + <label>_{Hometown}:</label> + <?= $form_helper->text_field('basic', '', array('class' => 'shorttextinput') )?> + </div> + <div class="formrow"> + <label>_{Political views}:</label> + <?= $form_options_helper->select('basic', 'political_view_id', $PoliticalView->collect($PoliticalView->find(), 'name', 'id'), array(), array('prompt' => $controller->t('Select Political Views:')) )?> + </div> + <div class="formrow"> + <label>_{Religious views}:</label> + <?= $form_helper->text_field('basic', 'religious_views', array('class' => 'shorttextinput') ) ?> + </div> + <div class="formrow"> + <label></label> + <input class="submitinput" type="submit" value="_{Save Changes}"> + <input class="cancelinput" type="button" value="_{Cancel}"> + </div> + </div> +</form> + Added: app/views/profile/contact.tpl =================================================================== --- app/views/profile/contact.tpl (rev 0) +++ app/views/profile/contact.tpl 2008-03-03 18:02:41 UTC (rev 37) @@ -0,0 +1,135 @@ +<?= $controller->renderPartial("menu") ?> + +<?= $controller->renderErrors() ?> + +<form action="/profile/contact" method="post"> + <div class="editform"> + <div class="formrow"> + <label>_{Emails}:</label> + <div class="formcol"> + <div class="middle"> + <?= $current_user->email ?> + </div> + <a href="#" class="lock">_{Only my friends}</a> + </div> + </div> + <div class="formrow"> + <label></label> + <div class="formcol"> + <div class="middle"> + <a href="#">Add / Remove Emails</a> + </div> + </div> + </div> + <div class="formrow"> + <label></label> + <div class="formcol"><div class="divider"></div></div> + </div> + <div class="formrow"> + <label>_{IM Screen Name(s)}:</label> + <div class="formcol"> + <div class="middle"> + <?= $form_helper->text_field('contact', 'im', array('class' => 'shorttextinput') )?> + </div> + <select class="imselect"> + <option>AIM</option> + <option>Google talk</option> + <option>Skype</option> + <option>Windows Live</option> + <option>Yahoo</option> + <option>Gadu-Gadu</option> + <option>ICQ</option> + </select> + </div> + </div> + <div class="formrow"> + <label></label> + <div class="formcol"> + <div class="middle"> + <a href="#">Add another screen name</a> + </div> + <a href="#" class="lock">_{Only my friends}</a> + </div> + </div> + <div class="formrow"> + <label></label> + <div class="formcol"><div class="divider"></div></div> + </div> + + <div class="formrow"> + <label>_{Mobile phone}:</label> + <div class="formcol"> + <div class="middle"> + <?= $form_helper->text_field('contact', 'mobile', array('class' => 'shorttextinput') )?> + </div> + <a href="#" class="lock">_{Only my friends}</a> + </div> + </div> + <div class="formrow"> + <label>_{Land phone}:</label> + <div class="formcol"> + <div class="middle"> + <?= $form_helper->text_field('contact', 'land', array('class' => 'shorttextinput') )?> + </div> + <a href="#" class="lock">_{Only my friends}</a> + </div> + </div> + <div class="formrow"> + <label></label> + <div class="formcol"><div class="divider"></div></div> + </div> + + <div class="formrow"> + <label>_{Country}:</label> + <div class="formcol"> + <div class="middle"> + <?= $form_options_helper->select('basic', 'country_id', $Country->collect($Country->find(), 'name', 'id'), array(), array('prompt' => $controller->t('Select Country:')) )?> + </div> + </div> + </div> + <div class="formrow"> + <label>_{City}:</label> + <div class="formcol"> + <div class="middle"> + <?= $form_helper->text_field('address', 'city', array('class' => 'textinput') )?> + </div> + </div> + </div> + <div class="formrow"> + <label>_{Address}:</label> + <div class="formcol"> + <div class="middle"> + <?= $form_helper->text_field('address', 'mobile', array('class' => 'textinput') )?> + </div> + </div> + </div> + <div class="formrow"> + <label></label> + <div class="formcol"> + <div class="middle"></div> + <a href="#" class="lock">_{Only my friends}</a> + </div> + </div> + <div class="formrow"> + <label></label> + <div class="formcol"><div class="divider"></div></div> + </div> + + <div class="formrow"> + <label>_{Website}:</label> + <div class="formcol"> + <div class="middle"> + <?= $form_helper->text_area('address', 'website' )?> + </div> + <a href="#" class="lock">_{Only my friends}</a> + </div> + </div> + + <div class="formrow"> + <label></label> + <input class="submitinput" type="submit" value="_{Save Changes}"> + <input class="cancelinput" type="button" value="_{Cancel}"> + </div> + </div> +</form> + Added: app/views/profile/groups.tpl =================================================================== --- app/views/profile/groups.tpl (rev 0) +++ app/views/profile/groups.tpl 2008-03-03 18:02:41 UTC (rev 37) @@ -0,0 +1,5 @@ +<?= $controller->renderPartial("menu") ?> + +<?= $controller->renderErrors() ?> + +<p>Coming soon</p> \ No newline at end of file Added: app/views/profile/index.tpl =================================================================== --- app/views/profile/index.tpl (rev 0) +++ app/views/profile/index.tpl 2008-03-03 18:02:41 UTC (rev 37) @@ -0,0 +1 @@ +Profile \ No newline at end of file Added: app/views/profile/personal.tpl =================================================================== --- app/views/profile/personal.tpl (rev 0) +++ app/views/profile/personal.tpl 2008-03-03 18:02:41 UTC (rev 37) @@ -0,0 +1,34 @@ +<?= $controller->renderPartial("menu") ?> + +<?= $controller->renderErrors() ?> + +<form action="/profile/personal" method="post"> + <div class="editform"> + <div class="formrow"> + <label>_{Activities}:</label> + <?= $form_helper->text_area('personal', 'activities')?> + </div> + + <div class="formrow"> + <label>_{Interests}:</label> + <?= $form_helper->text_area('personal', 'interests')?> + </div> + + <div class="formrow"> + <label>_{Favorite Music}:</label> + <?= $form_helper->text_area('personal', 'music')?> + </div> + + <div class="formrow"> + <label>_{Favorite TV Shows}:</label> + <?= $form_helper->text_area('personal', 'tv_shows')?> + </div> + + <div class="formrow"> + <label></label> + <input class="submitinput" type="submit" value="_{Save Changes}"> + <input class="cancelinput" type="button" value="_{Cancel}"> + </div> + </div> +</form> + Added: app/views/profile/picture.tpl =================================================================== --- app/views/profile/picture.tpl (rev 0) +++ app/views/profile/picture.tpl 2008-03-03 18:02:41 UTC (rev 37) @@ -0,0 +1,5 @@ +<?= $controller->renderPartial("menu") ?> + +<?= $controller->renderErrors() ?> + +<p>Coming soon</p> \ No newline at end of file Added: app/views/profile/relationships.tpl =================================================================== --- app/views/profile/relationships.tpl (rev 0) +++ app/views/profile/relationships.tpl 2008-03-03 18:02:41 UTC (rev 37) @@ -0,0 +1,55 @@ +<?= $controller->renderPartial("menu") ?> + +<?= $controller->renderErrors() ?> + +<form action="/profile/relationships" method="post"> + <div class="editform"> + <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:')) )?> + </div> + </div> + + <div class="formrow"> + <label>_{Former Name}:</label> + <div class="formcol"> + <?= $form_helper->text_field('relationship', 'former_name', array('class' => 'textinput') )?> + </div> + </div> + <div class="formrow"> + <label></label> + <div class="formcol"> + <div class="note"> + _{<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.} + </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> + </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> + </div> + </div> + + + <div class="formrow"> + <label></label> + <input class="submitinput" type="submit" value="_{Save Changes}"> + <input class="cancelinput" type="button" value="_{Cancel}"> + </div> + </div> +</form> + Modified: app/views/shared/loggedin/compiled/sidebar.tpl.php =================================================================== --- app/views/shared/loggedin/compiled/sidebar.tpl.php 2008-02-29 16:43:08 UTC (rev 36) +++ app/views/shared/loggedin/compiled/sidebar.tpl.php 2008-03-03 18:02:41 UTC (rev 37) @@ -7,12 +7,11 @@ <div id="qsearchfield"> <input id="query" name="query" type="text" class="textinput"> </div> - <div id="qsearchimage">a - </div> + <div id="qsearchimage"></div> </div> </form> </div> <div id="applications"> - <div>Photos</div> - <div>Groups</div> + <a href="/photo" class="photoapp"><?php echo $text_helper->translate('PhotoApp', array()); ?></a> + <a href="/groups" class="groupsapp"><?php echo $text_helper->translate('GroupApp', array()); ?></a> </div> \ No newline at end of file Modified: app/views/shared/loggedin/pageheader.tpl =================================================================== --- app/views/shared/loggedin/pageheader.tpl 2008-02-29 16:43:08 UTC (rev 36) +++ app/views/shared/loggedin/pageheader.tpl 2008-03-03 18:02:41 UTC (rev 37) @@ -1,5 +1,5 @@ <ul id="headermenuleft"> - <li><a class="globallink" href="/profile/">_{Profile}</a> <a href="/profile/edit">_{edit}</a></li> + <li><a class="globallink" href="/profile/">_{Profile}</a> <a href="/profile/basic">_{edit}</a></li> <li><a class="globallink" href="/friend/">_{Friends}</a></li> <li><a class="globallink" href="/message/">_{Messages} (0)</a></li> </ul> Modified: app/views/shared/loggedin/sidebar.tpl =================================================================== --- app/views/shared/loggedin/sidebar.tpl 2008-02-29 16:43:08 UTC (rev 36) +++ app/views/shared/loggedin/sidebar.tpl 2008-03-03 18:02:41 UTC (rev 37) @@ -7,12 +7,11 @@ <div id="qsearchfield"> <input id="query" name="query" type="text" class="textinput"> </div> - <div id="qsearchimage">a - </div> + <div id="qsearchimage"></div> </div> </form> </div> <div id="applications"> - <div>Photos</div> - <div>Groups</div> + <a href="/photo" class="photoapp">_{PhotoApp}</a> + <a href="/groups" class="groupsapp">_{GroupApp}</a> </div> \ No newline at end of file Modified: app/views/user/forgot_password.tpl =================================================================== --- app/views/user/forgot_password.tpl 2008-02-29 16:43:08 UTC (rev 36) +++ app/views/user/forgot_password.tpl 2008-03-03 18:02:41 UTC (rev 37) @@ -6,7 +6,7 @@ _{We will send you an email with a link to reset your password}.</p> <form action="/user/forgot_password" method="post"> - <div class="loginform"> + <div class="editform"> <div class="formrow"> <label>_{Email}:</label> <input class="textinput" type="text" name="email"> Modified: app/views/user/laststep.tpl =================================================================== --- app/views/user/laststep.tpl 2008-02-29 16:43:08 UTC (rev 36) +++ app/views/user/laststep.tpl 2008-03-03 18:02:41 UTC (rev 37) @@ -1,2 +1,2 @@ <div class="title">_{Last step}</div> -<div>_{Check please your email and click on confirmation link}.</div> +<p>_{Check please your email and click on confirmation link}.</p> Modified: app/views/user/login.tpl =================================================================== --- app/views/user/login.tpl 2008-02-29 16:43:08 UTC (rev 36) +++ app/views/user/login.tpl 2008-03-03 18:02:41 UTC (rev 37) @@ -3,7 +3,7 @@ <?= $controller->renderErrors() ?> <form action="/user/login" method="post"> - <div class="loginform"> + <div class="editform"> <div class="formrow"> <label>_{Email}:</label> <input class="textinput" type="text" name="email"> @@ -14,8 +14,9 @@ </div> <div class="formrow"> <label></label> - <input class="checkboxinput" type="checkbox" name="remember_me"> - <span>_{Remember me}</span> + <label class="checkbox"> + <input class="checkboxinput" type="checkbox" name="remember_me"> _{Remember me} + </label> </div> <div class="formrow"> <label></label> Modified: app/views/user/register.tpl =================================================================== --- app/views/user/register.tpl 2008-02-29 16:43:08 UTC (rev 36) +++ app/views/user/register.tpl 2008-03-03 18:02:41 UTC (rev 37) @@ -3,7 +3,7 @@ <?= $controller->renderErrors() ?> <form action="/user/register" method="post"> - <div class="loginform"> + <div class="editform"> <div class="formrow"> <label>_{Name}:</label> <?= $form_helper->text_field('user', 'name', array('class' => 'textinput') )?> Modified: app/views/user/reset_password.tpl =================================================================== --- app/views/user/reset_password.tpl 2008-02-29 16:43:08 UTC (rev 36) +++ app/views/user/reset_password.tpl 2008-03-03 18:02:41 UTC (rev 37) @@ -1,12 +1,10 @@ <div class="title">_{Reset Password}</div> -<? -if ($controller->getErrors()) { - echo $controller->renderErrors(); -} else { ?> -<div align="center">_{Please enter a new password}.</div> +<?= $controller->renderErrors(); ?> + +<p>_{Please enter a new password}.</p> <form action="/user/reset_password" method="post"> - <div class="loginform"> + <div class="editform"> <div class="formrow"> <label>_{New Password}:</label> <input class="textinput" type="password" name="user[password]"> Modified: app/views/user/thankyou.tpl =================================================================== --- app/views/user/thankyou.tpl 2008-02-29 16:43:08 UTC (rev 36) +++ app/views/user/thankyou.tpl 2008-03-03 18:02:41 UTC (rev 37) @@ -1,2 +1,2 @@ <div class="title">_{Thank you for registration}</div> - +<p>_{Registration complete}</p> Added: public/images/group.png =================================================================== (Binary files differ) Property changes on: public/images/group.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: public/images/lock.png =================================================================== (Binary files differ) Property changes on: public/images/lock.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: public/images/magnifier.png =================================================================== (Binary files differ) Property changes on: public/images/magnifier.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: public/images/photo.png =================================================================== (Binary files differ) Property changes on: public/images/photo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: public/stylesheets/Application.css =================================================================== --- public/stylesheets/Application.css 2008-02-29 16:43:08 UTC (rev 36) +++ public/stylesheets/Application.css 2008-03-03 18:02:41 UTC (rev 37) @@ -10,14 +10,22 @@ font-size: 11px; } +select{ + border:1px solid #BDC7D8; + font-family:verdana,arial,sans-serif; + font-size:11px; + padding:2px; +} + label { - clear: left; + color: #666666; display: block; cursor: pointer; - font-weight: bolder; + font-weight: bold; } label.persistent { + display: block; line-height: 16px; font: 11px normal; padding: 1px 0px 3px 0px; @@ -27,13 +35,6 @@ font-weight: normal; } -select{ - border:1px solid #BDC7D8; - font-family:verdana,arial,sans-serif; - font-size:11px; - padding:2px; -} - a { color: #3b5998; text-decoration: none; @@ -124,8 +125,8 @@ #pageheader { color: white; background-color: #3b5998; - line-height: 28px; - height: 28px; + line-height: 2em; + height: 2em; padding: 9px 0px 4px 0px; } @@ -192,6 +193,11 @@ padding: 0; } +#content p { + margin: 0px; + padding: 30px; +} + #pagefooter { clear: both; height: 50px; @@ -243,11 +249,35 @@ } #qsearchimage { - width: 21px; - background-color: blue; - height: 21px; + float: left; + background: url('/images/magnifier.png') no-repeat 0px; + width: 16px; + height: 16px; + margin: 3px; + cursor: pointer; } +#applications { + clear: both; + font-size: 11px; + margin: 10px; + padding: 10px 0px 0px 0px; +} + +#applications a { + display: block; + line-height: 16px; + padding-left: 20px; +} + +.photoapp { + background: url('/images/photo.png') no-repeat 0px; +} + +.groupsapp { + background: url('/images/group.png') no-repeat 0px; +} + .linksarea a { padding: 2px 5px 2px 5px; } @@ -277,15 +307,19 @@ } .textinput, .passwordinput { - width: 123px; + width: 200px; margin: 0px 0px 5px 0px; padding: 3px; font-size: 11px; } +.shorttextinput { + width: 80px; +} + .checkboxinput { border: 0px; - margin: 0px 0px 4px 0px; + margin: 4px 0px 0px 0px; } .error { @@ -312,3 +346,159 @@ border-bottom: 1px solid #dddddd; margin-bottom: 10px; } + +#content .tabs { + display:block; + padding: 20px 0px 15px 0px; + border-bottom: 1px solid #898989; +} + +.tabs .left { + float: left; + padding-left: 10px; +} + +.tabs .right { + float: right; + padding-right: 10px; +} + +.toggle_tabs { + display: block; + margin: 0px; + padding: 0px; + list-style: none; + text-align: center; +} + +.toggle_tabs li { + display: inline; + padding: 2px 0px 3px 0px; + background: #f1f1f1; +} + +.toggle_tabs li a { + border: 1px solid #898989; + border-left: 0px; + color: #333; + font-weight: bold; + padding:2px 8px 3px 9px; +} + +.toggle_tabs li a small { + font-size: 11px; + font-weight:normal; +} + +.toggle_tabs li a:focus { + outline: 0px; +} + +.toggle_tabs li.first a { + border: 1px solid #898989; +} + +.toggle_tabs li a.selected { + margin-left: -1px; + background: #6d84b4; + border: 1px solid #3b5998; + border-left: 1px solid #5973a9; + border-right: 1px solid #5973a9; + color:#fff; +} + +.toggle_tabs li.last a.selected { + margin-left: -1px; + border-left: 1px solid #5973a9; + border-right: 1px solid #36538f; +} + +.toggle_tabs li.first a.selected { + margin: 0px; + border-left: 1px solid #36538f; + border-right: 1px solid #5973a9; +} + +.toggle_tabs li.first.last a.selected { + border: 1px solid #36538f; +} + +.toggle_tabs li a.selected:hover { + text-decoration: none; +} + +.toggle_tabs li a.disabled { + color: #999; + cursor: default; +} + +.toggle_tabs li a.disabled:hover { + text-decoration:none; +} + +.divider { + margin: 5px 0px 5px 0px; + border-bottom: 1px solid #cccccc; +} + +#content .editform { + margin: 20px auto 20px auto; + width: 600px; +} + +.editform .formrow { + clear: both; + vertical-align: top; + padding: 0px 0px 3px 0px; + line-height: 16px; +} + +.formrow label { + display: block; + width: 150px; + float: left; + text-align: right; + padding: 3px 10px 3px; +} + +.formrow label.checkbox { + font-weight: normal; + color: #000; + text-align: left; + padding: 3px 0px 3px; +} + +.formrow .formcol { + float: left; + width: 360px; + padding: 3px 0px 3px 0px; + margin: 0px; +} + +.formrow .formcol .middle { + float: left; +} + +.formrow .formcol .lock { + display: block; + float: right; + padding-left: 20px; + background: url('/images/lock.png') no-repeat 0px; +} + +.formrow textarea { + width: 200px; + height: 100px; +} + +.formrow .textinput { + margin: 0px; +} + +.formrow .shorttextinput { + width: 200px; +} + +.formrow .note { + font-size: 10px; +} Modified: public/stylesheets/Default.css =================================================================== --- public/stylesheets/Default.css 2008-02-29 16:43:08 UTC (rev 36) +++ public/stylesheets/Default.css 2008-03-03 18:02:41 UTC (rev 37) @@ -1,3 +1,6 @@ -#pagecontent #content { - padding: 30px; +.sidetextinput { + width: 120px; + margin: 0px 0px 5px 0px; + padding: 3px; + font-size: 11px; } \ No newline at end of file Modified: public/stylesheets/Message.css =================================================================== --- public/stylesheets/Message.css 2008-02-29 16:43:08 UTC (rev 36) +++ public/stylesheets/Message.css 2008-03-03 18:02:41 UTC (rev 37) @@ -1,21 +1,3 @@ -#content .tabs { padding: 20px 0 15px; border-bottom:1px solid #898989; display:block; } -.tabs .left { padding-left: 10px; float: left; } -.tabs .right { padding-right:10px;float:right; } - -.toggle_tabs { margin:0; padding:0; list-style:none; text-align:center; display: block;} -.toggle_tabs li { display: block; float:left; padding:2px 0px 3px; background:#f1f1f1; } -.toggle_tabs li a { border:1px solid #898989; border-left:0; color:#333; font-weight:bold; padding:2px 8px 3px 9px; } -.toggle_tabs li a small { font-size:11px; font-weight:normal; } -.toggle_tabs li a:focus { outline:0px; } -.toggle_tabs li.first a { border:1px solid #898989; } -.toggle_tabs li a.selected { margin-left:-1px; background:#6d84b4; border:1px solid #3b5998; border-left:1px solid #5973a9; border-right:1px solid #5973a9; color:#fff; } -.toggle_tabs li.last a.selected { margin-left:-1px; border-left:1px solid #5973a9; border-right:1px solid #36538f; } -.toggle_tabs li.first a.selected { margin:0; border-left:1px solid #36538f; border-right:1px solid #5973a9; } -.toggle_tabs li.first.last a.selected { border:1px solid #36538f; } -.toggle_tabs li a.selected:hover { text-decoration:none; } -.toggle_tabs li a.disabled { color:#999;cursor:default; } -.toggle_tabs li a.disabled:hover { text-decoration:none; } - #content .inbox_submenu { background:#f7f7f7; border-bottom:1px solid #ccc; padding: 8px 20px 28px; } .inbox_submenu .menu_block { float:left; } .inbox_submenu .menu_block.selector { padding-right:5px; } @@ -28,30 +10,3 @@ .no_messages { color:#666; font-size:13px; padding:100px 0px 110px 0px; text-align:center; } .no_messages strong { color:#333; font-weight:bold; } - -#content .messageform { - margin: 20px auto 20px auto; - width: 510px; -} - -.messageform .formrow { - vertical-align: top; - padding: 0px 0px 3px 0px; -} - -.formrow label { - display: block; - width: 90px; - float: left; - text-align: right; - padding: 3px 10px 3px; -} - -.formrow textarea { - height: 150px; -} - -.formrow .textinput { - width: 350px; -} - Added: public/stylesheets/Profile.css =================================================================== --- public/stylesheets/Profile.css (rev 0) +++ public/stylesheets/Profile.css 2008-03-03 18:02:41 UTC (rev 37) @@ -0,0 +1,3 @@ +.imselect { + margin-left: 10px; +} \ No newline at end of file Modified: public/stylesheets/User.css =================================================================== --- public/stylesheets/User.css 2008-02-29 16:43:08 UTC (rev 36) +++ public/stylesheets/User.css 2008-03-03 18:02:41 UTC (rev 37) @@ -1,25 +1,3 @@ -#content .loginform { - margin: 20px auto 20px auto; - width: 310px; +#content editform { + padding: 30px; } - -.loginform .formrow { - vertical-align: top; - padding: 0px 0px 3px 0px; -} - -.formrow label { - display: block; - width: 110px; - float: left; - padding: 3px 0px 3px 0px; -} - -.formrow .textinput { - width: 175px; -} - -.formrow .forgotpassword { - line-height: 16px; - margin: 10px 0px 10px 0px; -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |