isocial-svn Mailing List for isocial (Page 6)
Status: Pre-Alpha
Brought to you by:
aguidrevitch
You can subscribe to this list here.
2008 |
Jan
|
Feb
(11) |
Mar
(80) |
Apr
(22) |
May
(90) |
Jun
(28) |
Jul
(33) |
Aug
(12) |
Sep
(3) |
Oct
|
Nov
|
Dec
|
---|
From: <fsn...@us...> - 2008-05-08 15:56:19
|
Revision: 179 http://isocial.svn.sourceforge.net/isocial/?rev=179&view=rev Author: fsnobody Date: 2008-05-08 08:55:34 -0700 (Thu, 08 May 2008) Log Message: ----------- add photo to album (not finixhed) Modified Paths: -------------- app/controllers/photoapp/album_controller.php app/controllers/preview_controller.php app/models/photoapp_album.php app/views/photoapp/album/add_photo.tpl app/views/photoapp/album/uploaded.tpl config/routes.php timesheet/eerunov.txt Added Paths: ----------- app/models/photoapp_photo.php Modified: app/controllers/photoapp/album_controller.php =================================================================== --- app/controllers/photoapp/album_controller.php 2008-05-07 17:43:41 UTC (rev 178) +++ app/controllers/photoapp/album_controller.php 2008-05-08 15:55:34 UTC (rev 179) @@ -2,7 +2,7 @@ class Photoapp_AlbumController extends ApplicationController { - var $models = array('photoapp', 'photoapp_album'); + var $models = array('photoapp', 'photoapp_album', 'photoapp_photo'); function index () { //$this->redirectTo(array('action' => 'show')); @@ -29,7 +29,7 @@ } */ function uploaded () { - $this->uploaded_albums = $this->PhotoappAlbum->find('all', array('conditions' => array('name IS NULL', 'caption IS NULL'))); + $this->uploaded_photos = $this->PhotoappPhoto->find('all', array('conditions' => array("name =''", "caption =''"))); return; } @@ -49,9 +49,9 @@ function add_photo () { - if (!empty($this->params['album'])){ + if (!empty($this->params['album']) && !empty($_FILES)){ // - print_r($this->params['album']); + $this->_upload($this->params); } else if ($this->params['id']) { $this->album = $this->PhotoappAlbum->find($this->params['id']); return; @@ -93,5 +93,34 @@ } } + function _upload($params) { + //$this->debug($_FILES); + for ($i = 1 ; $i < 6 ; $i++) { + $field = 'photo' . $i; + if ($_FILES['album']['error'][$field] == 0 ) { + // copy file; save photo + $copy_to = PROJECT_DIR . "public/images/uploaded/" . $_FILES['album']['name'][$field]; + $copy_from = $_FILES['album']['tmp_name'][$field]; + if (move_uploaded_file($copy_from, $copy_to)) { + $album = $this->PhotoappAlbum->find($this->params['id']); + + $this->PhotoappPhoto->img = $copy_to; + $this->PhotoappPhoto->album_id = $album->getId(); + + $this->PhotoappPhoto->setAttributes($atr); + $this->PhotoappPhoto->save(); + } + } + } // for + $this->redirectTo(array('action' => 'uploaded')); + + } + + function debug($str) { + echo "<pre>"; + print_r($str); + echo "</pre>"; + } + } ?> \ No newline at end of file Modified: app/controllers/preview_controller.php =================================================================== --- app/controllers/preview_controller.php 2008-05-07 17:43:41 UTC (rev 178) +++ app/controllers/preview_controller.php 2008-05-08 15:55:34 UTC (rev 179) @@ -9,9 +9,9 @@ function index () { @list($width, $height, $type) = explode('x', $this->params['size']); if ($width > 10 && $height > 10) { - $filename = join(DS, $this->params['path']); - $file = AK_PUBLIC_DIR . "/$filename"; - + //$filename = join(DS, $this->params['path']); + $file = AK_PUBLIC_DIR . "/images/uploaded/" . $this->params['path']; + if (file_exists($file) && !is_dir($file)) { $data = $this->createJPEGPreview($file, $width, $height, $type); header("Content-Type: " . image_type_to_mime_type(IMAGETYPE_JPEG)); Modified: app/models/photoapp_album.php =================================================================== --- app/models/photoapp_album.php 2008-05-07 17:43:41 UTC (rev 178) +++ app/models/photoapp_album.php 2008-05-08 15:55:34 UTC (rev 179) @@ -3,6 +3,7 @@ class PhotoappAlbum extends ActiveRecord { //var $has_one = array('group_member' => array('class_name' => 'GroupappMember','foreign_key' => 'group_id'), ); + var $has_many = array('photos' => array('class_name' => 'PhotoappPhoto', 'foreign_key' => 'album_id')); function validateOnCreate () { Added: app/models/photoapp_photo.php =================================================================== --- app/models/photoapp_photo.php (rev 0) +++ app/models/photoapp_photo.php 2008-05-08 15:55:34 UTC (rev 179) @@ -0,0 +1,9 @@ +<?php + +class PhotoappPhoto extends ActiveRecord +{ + var $belongs_to = array('album' => array('class_name' => 'PhotoappAlbum', 'primary_key_name' => 'album_id') ); + +} + +?> Modified: app/views/photoapp/album/add_photo.tpl =================================================================== --- app/views/photoapp/album/add_photo.tpl 2008-05-07 17:43:41 UTC (rev 178) +++ app/views/photoapp/album/add_photo.tpl 2008-05-08 15:55:34 UTC (rev 179) @@ -14,7 +14,7 @@ <?= $controller->renderPartial("edit_menu") ?> <div class="album_step"> - <?= $form_tag_helper->start_form_tag(array('action'=>'add_photo', 'id' => $album->getId(), 'enctype' => 'multipart/form-data')) ?> + <?= $form_tag_helper->start_form_tag(array('action'=>'add_photo', 'id' => $album->getId()), array('multipart' => true)) ?> <div class="form_create_clear red"> Modified: app/views/photoapp/album/uploaded.tpl =================================================================== --- app/views/photoapp/album/uploaded.tpl 2008-05-07 17:43:41 UTC (rev 178) +++ app/views/photoapp/album/uploaded.tpl 2008-05-08 15:55:34 UTC (rev 179) @@ -6,16 +6,19 @@ <div class="album_step"> <?= $form_tag_helper->start_form_tag(array('action'=>'uploaded')) ?> - <? if ($uploaded_albums == 0) {?> + <? if ($uploaded_photos == 0) {?> <div class="noalbums"> _{You have no any uploaded and not edited photos}. </div> <? } else {?> <div class="container"> - {loop uploaded_albums} + {loop uploaded_photos} <div class="album"> - <div class="img">IMG: <?= $uploaded_album->get('img')?></div> + <div class="img"> + IMG: <?= $uploaded_photo->get('img')?> + <img src="/preview/index/100x100/Supermassive_Black_Hole_by_Remind_me.jpg" /> + </div> </div> {end} </div> Modified: config/routes.php =================================================================== --- config/routes.php 2008-05-07 17:43:41 UTC (rev 178) +++ config/routes.php 2008-05-08 15:55:34 UTC (rev 179) @@ -5,6 +5,7 @@ $Map->connect('/', array('controller' => 'default', 'action' => 'index')); $Map->connect('/groupapp/:controller/:action/:id', array('controller' => 'group', 'action' => 'index', 'module' => 'groupapp')); $Map->connect('/photoapp/:controller/:action/:id', array('controller' => 'album', 'action' => 'index', 'module' => 'photoapp')); +$Map->connect('/preview/:action/:size/:path',array('controller' => 'preview', 'action' => 'index') ); $Map->connect('/:controller/:action/:id', array('controller' => 'default', 'action' => 'index')); $Map->connect('/:controller/:action/:from/:id', array('controller' => 'message', 'action' => 'show')); Modified: timesheet/eerunov.txt =================================================================== --- timesheet/eerunov.txt 2008-05-07 17:43:41 UTC (rev 178) +++ timesheet/eerunov.txt 2008-05-08 15:55:34 UTC (rev 179) @@ -7,3 +7,5 @@ 2008-05-01,12:00,15:40,photoapp,RT:2,"redesign + album list + start edit albums" 2008-05-05,09:00,11:00,photoapp,RT:2,"minor fixes + edit album" 2008-05-06,09:00,10:20,photoapp,RT:2,"share create form + changes in installer + fixes + add_photo form design" +2008-05-07,14:00,15:30,photoapp,RT:2,"photo controller" +2008-05-08,09:00,11:00,photoapp,RT:2,"preview controller use + add photo designet and part functional" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2008-05-07 17:43:33
|
Revision: 178 http://isocial.svn.sourceforge.net/isocial/?rev=178&view=rev Author: dim0s77 Date: 2008-05-07 10:43:41 -0700 (Wed, 07 May 2008) Log Message: ----------- timesheeted Modified Paths: -------------- timesheet/dim0s77.txt Modified: timesheet/dim0s77.txt =================================================================== --- timesheet/dim0s77.txt 2008-05-07 17:40:27 UTC (rev 177) +++ timesheet/dim0s77.txt 2008-05-07 17:43:41 UTC (rev 178) @@ -10,3 +10,5 @@ 2008-05-01,15:00,16:55,groupapp,RT:3,"Creation tab 'discussion board' with no topics for groupapp" 2008-05-06,19:30,20:50,groupapp,RT:3,"complete 'start new topic' and begin 'show topics'" + +2008-05-07,19:00,20:40,groupapp,RT:3,"create template for topic messages" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2008-05-07 17:40:21
|
Revision: 177 http://isocial.svn.sourceforge.net/isocial/?rev=177&view=rev Author: dim0s77 Date: 2008-05-07 10:40:27 -0700 (Wed, 07 May 2008) Log Message: ----------- create template for topic messages Modified Paths: -------------- app/controllers/groupapp/board_controller.php app/views/groupapp/board/show_topic.tpl public/stylesheets/groupapp/Board.css Modified: app/controllers/groupapp/board_controller.php =================================================================== --- app/controllers/groupapp/board_controller.php 2008-05-07 15:41:03 UTC (rev 176) +++ app/controllers/groupapp/board_controller.php 2008-05-07 17:40:27 UTC (rev 177) @@ -9,12 +9,15 @@ function show_topic () { if (!empty($this->params['id'])) { - $topic = $this->GroupappMessage->findFirst(array( 'id' => $this->params['id'] )); + $topic = $this->GroupappMessage->find('all', + array('conditions' => + array("topic_id = ?", $this->params['id'])) + ); if ($topic) { - $member = $this->GroupappMember->findFirst(array( 'group_id' => $topic->group_id, + $member = $this->GroupappMember->findFirst(array( 'group_id' => $topic[0]->group_id, 'user_id' => $this->current_user->getId() )); - $group = $this->GroupappGroup->findFirst(array( 'id' => $topic->group_id )); + $group = $this->GroupappGroup->findFirst(array( 'id' => $topic[0]->group_id )); if (($group && $group->access == 1) || $member) { $this->topic = $topic; } else { Modified: app/views/groupapp/board/show_topic.tpl =================================================================== --- app/views/groupapp/board/show_topic.tpl 2008-05-07 15:41:03 UTC (rev 176) +++ app/views/groupapp/board/show_topic.tpl 2008-05-07 17:40:27 UTC (rev 177) @@ -4,7 +4,7 @@ <div class="submenu"> <div class="menu_block"> - <div class="header">_{Topic}: {topic.subject?}</div> + <div class="header">_{Topic}: {topic-0.subject?}</div> </div> <div class="menu_block right"> @@ -15,3 +15,37 @@ <div class="clearfix"></div> {end} <?= $controller->renderErrors() ?> + +<div class="messages_list"> + <div class="info">Displaying all 3 posts by 2 people.</div> + <div class="row"> + + <div class="actions"> + <ul class="actions_list"> + <li><a href="/groupapp/">_{Reply to}</a></li> + <li><a href="/groupapp/group/edit_info/{group.id?}">_{Mark as Irrelevant}</a></li> + <li><a href="/groupapp/group/edit_members/{group.id?}">_{Report}</a></li> + <li><a href="/groupapp/group/edit_members/{group.id?}">_{Delete Post}</a></li> + </ul> + </div> + + <div class="avatar"> + <a href="/profile/show/{sender.id?}"><img src="/images/nophoto_men_sm.gif" alt="" class=""></a> + <div class="subtext">Post # </div> + <div class="subtext black">1 reply</div> + </div> + + <div class="message"> + <div class="head"> + <div class="sender">wrote</div> + <div class="subtext">datetime </div> + </div> + <div class="body"> + body + </div> + </div> + + </div> + <div class="clearfix"></div> +</div> +<div class="clearfix"></div> Modified: public/stylesheets/groupapp/Board.css =================================================================== --- public/stylesheets/groupapp/Board.css 2008-05-07 15:41:03 UTC (rev 176) +++ public/stylesheets/groupapp/Board.css 2008-05-07 17:40:27 UTC (rev 177) @@ -8,3 +8,58 @@ border: solid 1px #dddddd; } +.messages_list { + padding-top: 10px; + float: left; + background: #ffffff; + width: 100%; +} + +.messages_list .info { + padding: 0px 0px 5px 20px; +} + +.messages_list .row { + border-top: 1px solid #cccccc; + display: block; + padding: 10px; +} + +.messages_list .row .actions { + float: right; + width: 165px; +} + +.messages_list .row .avatar { + float: left; + width: 60px; +} + +.subtext { + display: block; + padding: 2px 0px 0px 0px; + font-size: 9px; + color: #777777; +} + +.subtext.black { + color: #000000; +} + +.messages_list .row .message { + float: left; + width: 370px; + padding-left: 5px; +} + +.messages_list .row .message .head { + padding: 3px; + border-top: 1px solid #3b5998; + border-bottom: 1px solid #e2e2e2; + background: #f7f7f7; +} + +.messages_list .row .message .body { + background: #ffffff; + padding: 10px 3px 10px 3px; +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fsn...@us...> - 2008-05-07 15:41:06
|
Revision: 176 http://isocial.svn.sourceforge.net/isocial/?rev=176&view=rev Author: fsnobody Date: 2008-05-07 08:41:03 -0700 (Wed, 07 May 2008) Log Message: ----------- photoapp.css added Modified Paths: -------------- app/controllers/photoapp/album_controller.php app/installers/photoapp/photo_installer.php app/locales/photoapp/album/ru.php app/views/photoapp/album/_edit_menu.tpl app/views/photoapp/album/add_photo.tpl app/views/photoapp/album/edit.tpl Added Paths: ----------- app/views/photoapp/album/_edit_title.tpl app/views/photoapp/album/uploaded.tpl public/stylesheets/photoapp/Photoapp.css Modified: app/controllers/photoapp/album_controller.php =================================================================== --- app/controllers/photoapp/album_controller.php 2008-05-07 07:55:15 UTC (rev 175) +++ app/controllers/photoapp/album_controller.php 2008-05-07 15:41:03 UTC (rev 176) @@ -28,6 +28,11 @@ function create () { } */ + function uploaded () { + $this->uploaded_albums = $this->PhotoappAlbum->find('all', array('conditions' => array('name IS NULL', 'caption IS NULL'))); + return; + } + function add () { if (!empty($this->params['album'])){ $this->PhotoappAlbum->setAttributes($this->params['album']); Modified: app/installers/photoapp/photo_installer.php =================================================================== --- app/installers/photoapp/photo_installer.php 2008-05-07 07:55:15 UTC (rev 175) +++ app/installers/photoapp/photo_installer.php 2008-05-07 15:41:03 UTC (rev 176) @@ -14,9 +14,7 @@ `name` char(100) NOT NULL DEFAULT '', `caption` char(255) NOT NULL DEFAULT '', `created_at` datetime NOT NULL , - `img` char(255) NOT NULL DEFAULT '', - `img_preview` char(255) NOT NULL DEFAULT '', - `img_small` char(255) NOT NULL DEFAULT '' + `img` char(255) NOT NULL DEFAULT '' ) ENGINE=InnoDB"); @@ -24,7 +22,7 @@ function down_1() { - $this->dropTable('photoapp_photo'); + $this->dropTable('photoapp_photos'); } } Modified: app/locales/photoapp/album/ru.php =================================================================== --- app/locales/photoapp/album/ru.php 2008-05-07 07:55:15 UTC (rev 175) +++ app/locales/photoapp/album/ru.php 2008-05-07 15:41:03 UTC (rev 176) @@ -6,7 +6,7 @@ $dictionary['My Photos'] = 'Мои Фото'; $dictionary['Photos'] = 'Фото'; -$dictionary['Photos of You'] = 'Фото с Вами'; +$dictionary['Photos of You'] = 'Мои личные фото'; $dictionary['Create a Photo Album'] = 'Создать фото альбом'; $dictionary['Welcome to PROJECT_NAME Photos'] = 'Добро пожаловать в PROJECT_NAME Фото'; $dictionary['Name'] = 'Название'; @@ -18,16 +18,17 @@ $dictionary['My Albums'] = 'Мои альбомы'; $dictionary['Create a New Album'] = 'Создать новый альбом'; $dictionary['You have no any album'] = 'У вас нет альбомов'; -$dictionary['Photo Albums'] = 'Фото альбомов'; -$dictionary['Album Privacy'] = 'Доступ альбомов'; +$dictionary['Photo Albums'] = 'Фотоальбомов'; +$dictionary['Album Privacy'] = 'Доступ к альбомам'; $dictionary['Description'] = 'Описание'; $dictionary['Created'] = 'Создан'; $dictionary['Edit Album'] = 'Редактировать альбом'; -$dictionary['View Album'] = 'Просмотр альбома'; -$dictionary['Delete Album'] = 'Удаление альбома'; +$dictionary['View Album'] = 'Просмотреть альбом'; +$dictionary['Delete Album'] = 'Удалить альбом'; $dictionary['photos'] = 'фотографий'; $dictionary['Upload'] = 'Загрузить'; $dictionary['Choose'] = 'Обзор'; +$dictionary['Uploaded'] = 'Загруженные'; Modified: app/views/photoapp/album/_edit_menu.tpl =================================================================== --- app/views/photoapp/album/_edit_menu.tpl 2008-05-07 07:55:15 UTC (rev 175) +++ app/views/photoapp/album/_edit_menu.tpl 2008-05-07 15:41:03 UTC (rev 176) @@ -2,6 +2,7 @@ <div class="left"> <ul class="toggle_tabs"> <li class="first"><a href="/photoapp/album/add_photo/{id}" class="<?= $controller->getActionName() == 'add_photo' ? 'selected' : '' ?>">_{Add Photos}</a></li><? + ?><li class="first"><a href="/photoapp/album/uploaded/{id}" class="<?= $controller->getActionName() == 'uploaded' ? 'selected' : '' ?>">_{Edit uploaded}</a></li><? ?><li><a href="/photoapp/album/edit/{id}" class="last <?= $controller->getActionName() == 'edit' ? 'selected' : '' ?>">_{Edit Info}</a></li><? ?><li><a href="/photoapp/album/delete/{id}" class="last <?= $controller->getActionName() == 'delete' ? 'selected' : '' ?>">_{Delete}</a></li> </ul> Added: app/views/photoapp/album/_edit_title.tpl =================================================================== --- app/views/photoapp/album/_edit_title.tpl (rev 0) +++ app/views/photoapp/album/_edit_title.tpl 2008-05-07 15:41:03 UTC (rev 176) @@ -0,0 +1,11 @@ +<div class="title_bar"> + <div class="info"> + <div class="header"> + <div class="name">_{Edit Album}</div> + </div> + <div class="clearfix"></div> + </div> +</div> +<div class="clearfix"></div> + +<?= $controller->renderErrors() ?> \ No newline at end of file Modified: app/views/photoapp/album/add_photo.tpl =================================================================== --- app/views/photoapp/album/add_photo.tpl 2008-05-07 07:55:15 UTC (rev 175) +++ app/views/photoapp/album/add_photo.tpl 2008-05-07 15:41:03 UTC (rev 176) @@ -14,7 +14,7 @@ <?= $controller->renderPartial("edit_menu") ?> <div class="album_step"> - <?= $form_tag_helper->start_form_tag(array('action'=>'add_photo', 'id' => $album->getId())) ?> + <?= $form_tag_helper->start_form_tag(array('action'=>'add_photo', 'id' => $album->getId(), 'enctype' => 'multipart/form-data')) ?> <div class="form_create_clear red"> Modified: app/views/photoapp/album/edit.tpl =================================================================== --- app/views/photoapp/album/edit.tpl 2008-05-07 07:55:15 UTC (rev 175) +++ app/views/photoapp/album/edit.tpl 2008-05-07 15:41:03 UTC (rev 176) @@ -1,6 +1,3 @@ - -<?= $controller->renderErrors() ?> - <div class="title_bar"> <div class="info"> <div class="header"> @@ -11,6 +8,8 @@ </div> <div class="clearfix"></div> +<?= $controller->renderErrors() ?> + <?= $controller->renderPartial("edit_menu") ?> Added: app/views/photoapp/album/uploaded.tpl =================================================================== --- app/views/photoapp/album/uploaded.tpl (rev 0) +++ app/views/photoapp/album/uploaded.tpl 2008-05-07 15:41:03 UTC (rev 176) @@ -0,0 +1,28 @@ +<?= $controller->renderPartial("edit_title") ?> + +<?= $controller->renderPartial("edit_menu") ?> + + +<div class="album_step"> + <?= $form_tag_helper->start_form_tag(array('action'=>'uploaded')) ?> + + <? if ($uploaded_albums == 0) {?> + <div class="noalbums"> + _{You have no any uploaded and not edited photos}. + </div> + <? } else {?> + + <div class="container"> + {loop uploaded_albums} + <div class="album"> + <div class="img">IMG: <?= $uploaded_album->get('img')?></div> + </div> + {end} + </div> + <div class="clearfix"></div> + <? }?> + + + </form> +</div> +<div class="clearfix"></div> Added: public/stylesheets/photoapp/Photoapp.css =================================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fsn...@us...> - 2008-05-07 07:55:08
|
Revision: 175 http://isocial.svn.sourceforge.net/isocial/?rev=175&view=rev Author: fsnobody Date: 2008-05-07 00:55:15 -0700 (Wed, 07 May 2008) Log Message: ----------- fixez Modified Paths: -------------- app/controllers/photoapp/album_controller.php app/locales/photoapp/album/ru.php app/views/photoapp/album/add.tpl app/views/photoapp/album/add_photo.tpl app/views/photoapp/album/index.tpl Modified: app/controllers/photoapp/album_controller.php =================================================================== --- app/controllers/photoapp/album_controller.php 2008-05-07 07:40:02 UTC (rev 174) +++ app/controllers/photoapp/album_controller.php 2008-05-07 07:55:15 UTC (rev 175) @@ -46,6 +46,7 @@ if (!empty($this->params['album'])){ // + print_r($this->params['album']); } else if ($this->params['id']) { $this->album = $this->PhotoappAlbum->find($this->params['id']); return; Modified: app/locales/photoapp/album/ru.php =================================================================== --- app/locales/photoapp/album/ru.php 2008-05-07 07:40:02 UTC (rev 174) +++ app/locales/photoapp/album/ru.php 2008-05-07 07:55:15 UTC (rev 175) @@ -6,7 +6,7 @@ $dictionary['My Photos'] = 'Мои Фото'; $dictionary['Photos'] = 'Фото'; -$dictionary['Photos of You'] = 'Фото для Вас'; +$dictionary['Photos of You'] = 'Фото с Вами'; $dictionary['Create a Photo Album'] = 'Создать фото альбом'; $dictionary['Welcome to PROJECT_NAME Photos'] = 'Добро пожаловать в PROJECT_NAME Фото'; $dictionary['Name'] = 'Название'; @@ -15,16 +15,16 @@ $dictionary['Privacy'] = 'Доступ'; $dictionary['Create Album'] = 'Создать альбом'; -$dictionary['My Albums'] = 'Мои Альбомы'; +$dictionary['My Albums'] = 'Мои альбомы'; $dictionary['Create a New Album'] = 'Создать новый альбом'; $dictionary['You have no any album'] = 'У вас нет альбомов'; $dictionary['Photo Albums'] = 'Фото альбомов'; $dictionary['Album Privacy'] = 'Доступ альбомов'; $dictionary['Description'] = 'Описание'; $dictionary['Created'] = 'Создан'; -$dictionary['Edit Album'] = 'Редактировать Альбом'; -$dictionary['View Album'] = 'Просмотр Альбома'; -$dictionary['Delete Album'] = 'Удаление Альбома'; +$dictionary['Edit Album'] = 'Редактировать альбом'; +$dictionary['View Album'] = 'Просмотр альбома'; +$dictionary['Delete Album'] = 'Удаление альбома'; $dictionary['photos'] = 'фотографий'; $dictionary['Upload'] = 'Загрузить'; $dictionary['Choose'] = 'Обзор'; Modified: app/views/photoapp/album/add.tpl =================================================================== --- app/views/photoapp/album/add.tpl 2008-05-07 07:40:02 UTC (rev 174) +++ app/views/photoapp/album/add.tpl 2008-05-07 07:55:15 UTC (rev 175) @@ -1,6 +1,3 @@ - -<?= $controller->renderErrors() ?> - <div class="title_bar"> <div class="info"> <div class="header"> @@ -11,6 +8,7 @@ </div> <div class="clearfix"></div> +<?= $controller->renderErrors() ?> <div class="album_step"> <?= $form_tag_helper->start_form_tag(array('action'=>'add')) ?> Modified: app/views/photoapp/album/add_photo.tpl =================================================================== --- app/views/photoapp/album/add_photo.tpl 2008-05-07 07:40:02 UTC (rev 174) +++ app/views/photoapp/album/add_photo.tpl 2008-05-07 07:55:15 UTC (rev 175) @@ -15,6 +15,7 @@ <div class="album_step"> <?= $form_tag_helper->start_form_tag(array('action'=>'add_photo', 'id' => $album->getId())) ?> + <div class="form_create_clear red"> <div class="form_create_row"> Modified: app/views/photoapp/album/index.tpl =================================================================== --- app/views/photoapp/album/index.tpl 2008-05-07 07:40:02 UTC (rev 174) +++ app/views/photoapp/album/index.tpl 2008-05-07 07:55:15 UTC (rev 175) @@ -21,7 +21,7 @@ <? } else {?> <div class="album_list"> - <?= $count_albums?> _{Photo Albums} <span>|</span> <a href="#" >_{Album Privacy}</a> + _{Photo Albums}: <?= $count_albums?> <span>|</span> <a href="#" >_{Album Privacy}</a> </div> <div class="container"> {loop my_albums} @@ -29,9 +29,9 @@ <div class="img">IMG</div> <div class="info"> <div class="name_album"><a href="/photoapp/album/view/<?= $my_album->get('id')?>"><?= $my_album->get('name') ?></a></div> - <div class="photos_count"><?= $my_album->get('photos_count')?> _{photos}</div> + <div class="photos_count">_{photos}: <?= $my_album->get('photos_count')?> </div> <div class="description">_{Description}: <?= $my_album->get('description')?></div> - <div class="photos_count">_{Created} <?= strftime("%b %e", strtotime($my_album->get('created_at')))?></div> + <div class="photos_count">_{Created}: <?= $my_album->get('created_at')?></div> </div> <div class="links"> <ul class="actions_list"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <agu...@us...> - 2008-05-07 07:39:58
|
Revision: 174 http://isocial.svn.sourceforge.net/isocial/?rev=174&view=rev Author: aguidrevitch Date: 2008-05-07 00:40:02 -0700 (Wed, 07 May 2008) Log Message: ----------- image preview controller mockup Added Paths: ----------- app/controllers/preview_controller.php Added: app/controllers/preview_controller.php =================================================================== --- app/controllers/preview_controller.php (rev 0) +++ app/controllers/preview_controller.php 2008-05-07 07:40:02 UTC (rev 174) @@ -0,0 +1,127 @@ +<?php + +class PreviewController extends ApplicationController { + + var $layout = ''; + + function beforeFilter () {} + + function index () { + @list($width, $height, $type) = explode('x', $this->params['size']); + if ($width > 10 && $height > 10) { + $filename = join(DS, $this->params['path']); + $file = AK_PUBLIC_DIR . "/$filename"; + + if (file_exists($file) && !is_dir($file)) { + $data = $this->createJPEGPreview($file, $width, $height, $type); + header("Content-Type: " . image_type_to_mime_type(IMAGETYPE_JPEG)); + header("Content-Length: " . strlen($data)); + echo $data; + exit; + } else { + header('HTTP/1.0 404 Not Found'); + echo 'HTTP/1.0 404 Image Not Found'; + exit; + } + } else { + header('HTTP/1.0 404 Not Found'); + echo 'HTTP/1.0 404 Preview size Not Found'; + exit; + } + } + + + /** + * + * $type = 0 - fit + * $type = 1 - white borders + * $type = 2 - cut borders + * $type = 3 - as 2, but don't cut borders + * + **/ + function createJPEGPreview($src, $width, $height, $type = 0) { + list($fwidth, $fheight, $itype, $attr) = getimagesize($src); + + // loading + $orig = imagecreatefromstring(file_get_contents($src)); + if ($orig) { + + $hratio = $width / $fwidth; + $vratio = $height / $fheight; + + if (!$type) { + if ( $hratio < $vratio) { + // fitting height + $width = $fwidth * $hratio; + $height = $fheight * $hratio; + + } else { + // fitting width + $width = $fwidth * $vratio; + $height = $fheight * $vratio; + } + + } else { + + $result = ($type == 1) + ? $hratio < $vratio + : $hratio > $vratio; + + if ($type == 3) { + + if ($result) { + $height = $fheight * ($width / $fwidth); + } else { + $width = $fwidth * ($height / $fheight); + } + + $swidth = $fwidth; + $sheight = $fheight; + $x = 0; + $y = 0; + + } else { + + if ($result) { + // fit width + $swidth = $fwidth; + $sheight = $height / ($width / $fwidth); + $x = 0; + $y = ($fheight - round( $sheight )) / 2; + } else { + // fit height + $sheight = $fheight; + $swidth = $width / ($height / $fheight ); + $y = 0; + $x = ($fwidth - round( $swidth )) / 2; + } + } + } + + // blank $width x $height image + $preview = imagecreatetruecolor($width, $height); + $white = imagecolorallocate($preview, 255, 255, 255); + + // if proportions meet + if ( !$type || $width / $fwidth == $height / $fheight) { + imagecopyresampled($preview, $orig, 0, 0, 0, 0, $width, $height, $fwidth, $fheight); + } else { + imagecopyresampled($preview, $orig, 0, 0, $x, $y, $width, $height, $swidth, $sheight); + // if image got borders, we should fill them + if ($type == 1) { + imagefill($preview, 0, 0, $white); + imagefill($preview, $width-1, $height-1, $white); + } + } + + ob_start(); + imagejpeg($preview); + $result = ob_get_contents(); + ob_end_clean(); + + return $result; + } + } +} + +?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fsn...@us...> - 2008-05-07 05:58:34
|
Revision: 173 http://isocial.svn.sourceforge.net/isocial/?rev=173&view=rev Author: fsnobody Date: 2008-05-06 22:58:38 -0700 (Tue, 06 May 2008) Log Message: ----------- photos installer add Modified Paths: -------------- app/views/photoapp/album/index.tpl Added Paths: ----------- app/installers/photoapp/photo_installer.php Added: app/installers/photoapp/photo_installer.php =================================================================== --- app/installers/photoapp/photo_installer.php (rev 0) +++ app/installers/photoapp/photo_installer.php 2008-05-07 05:58:38 UTC (rev 173) @@ -0,0 +1,31 @@ +<?php +class PhotoInstaller extends AkInstaller +{ + var $module = 'photoapp'; + + function up_1() + { + + $this->execute( + "CREATE TABLE `photoapp_photos` ( + `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT, + `album_id` int(11) NOT NULL , + `is_cover` int(1) UNSIGNED NOT NULL DEFAULT '0', + `name` char(100) NOT NULL DEFAULT '', + `caption` char(255) NOT NULL DEFAULT '', + `created_at` datetime NOT NULL , + `img` char(255) NOT NULL DEFAULT '', + `img_preview` char(255) NOT NULL DEFAULT '', + `img_small` char(255) NOT NULL DEFAULT '' + + ) ENGINE=InnoDB"); + + } + + function down_1() + { + $this->dropTable('photoapp_photo'); + } +} + +?> \ No newline at end of file Modified: app/views/photoapp/album/index.tpl =================================================================== --- app/views/photoapp/album/index.tpl 2008-05-07 05:35:43 UTC (rev 172) +++ app/views/photoapp/album/index.tpl 2008-05-07 05:58:38 UTC (rev 173) @@ -39,11 +39,6 @@ <li><a href="/photoapp/album/view/<?= $my_album->get('id')?>">_{View Album}</a></li> <li><a href="/photoapp/album/delete/<?= $my_album->get('id')?>">_{Delete Album}</a></li> </ul> -<!-- - <div><a href="/photoapp/album/add_photo/<?= $my_album->get('id')?>">_{Edit Album}</a></div> - <div><a href="/photoapp/album/view/<?= $my_album->get('id')?>">_{View Album}</a></div> - <div><a href="/photoapp/album/delete/<?= $my_album->get('id')?>">_{Delete Album}</a></div> ---> </div> </div> {end} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fsn...@us...> - 2008-05-07 05:36:04
|
Revision: 172 http://isocial.svn.sourceforge.net/isocial/?rev=172&view=rev Author: fsnobody Date: 2008-05-06 22:35:43 -0700 (Tue, 06 May 2008) Log Message: ----------- fixed bug in edit album Modified Paths: -------------- app/controllers/photoapp/album_controller.php Modified: app/controllers/photoapp/album_controller.php =================================================================== --- app/controllers/photoapp/album_controller.php 2008-05-07 05:02:19 UTC (rev 171) +++ app/controllers/photoapp/album_controller.php 2008-05-07 05:35:43 UTC (rev 172) @@ -54,9 +54,10 @@ function edit () { if (!empty($this->params['album'])){ - $this->PhotoappAlbum->setAttributes($this->params['album']); - $this->PhotoappAlbum->owner = $this->current_user->getId(); - if ($this->Request->isPost() && $this->PhotoappAlbum->save()){ + $album = $this->PhotoappAlbum->findFirst(array('id' => $this->params['id'])); + $album->setAttributes($this->params['album']); + $album->owner = $this->current_user->getId(); + if ($this->Request->isPost() && $album->save()){ // success $this->redirectTo(array('action' => 'index')); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fsn...@us...> - 2008-05-07 05:02:13
|
Revision: 171 http://isocial.svn.sourceforge.net/isocial/?rev=171&view=rev Author: fsnobody Date: 2008-05-06 22:02:19 -0700 (Tue, 06 May 2008) Log Message: ----------- design links on index like groups Modified Paths: -------------- app/views/photoapp/album/index.tpl public/stylesheets/photoapp/Album.css Modified: app/views/photoapp/album/index.tpl =================================================================== --- app/views/photoapp/album/index.tpl 2008-05-06 17:54:37 UTC (rev 170) +++ app/views/photoapp/album/index.tpl 2008-05-07 05:02:19 UTC (rev 171) @@ -34,9 +34,16 @@ <div class="photos_count">_{Created} <?= strftime("%b %e", strtotime($my_album->get('created_at')))?></div> </div> <div class="links"> + <ul class="actions_list"> + <li><a href="/photoapp/album/add_photo/<?= $my_album->get('id')?>">_{Edit Album}</a></li> + <li><a href="/photoapp/album/view/<?= $my_album->get('id')?>">_{View Album}</a></li> + <li><a href="/photoapp/album/delete/<?= $my_album->get('id')?>">_{Delete Album}</a></li> + </ul> +<!-- <div><a href="/photoapp/album/add_photo/<?= $my_album->get('id')?>">_{Edit Album}</a></div> <div><a href="/photoapp/album/view/<?= $my_album->get('id')?>">_{View Album}</a></div> <div><a href="/photoapp/album/delete/<?= $my_album->get('id')?>">_{Delete Album}</a></div> +--> </div> </div> {end} Modified: public/stylesheets/photoapp/Album.css =================================================================== --- public/stylesheets/photoapp/Album.css 2008-05-06 17:54:37 UTC (rev 170) +++ public/stylesheets/photoapp/Album.css 2008-05-07 05:02:19 UTC (rev 171) @@ -176,7 +176,7 @@ } .album .info { - width: 315px; + width: 325px; float: left; height: 120px; padding: 0px 5px 0px 0px; @@ -203,7 +203,7 @@ .album .links { padding: 3px 0px; font-size: 10px; - width: 150px; + width: 140px; float: left; height: 120px; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <di...@us...> - 2008-05-06 17:55:16
|
Revision: 170 http://isocial.svn.sourceforge.net/isocial/?rev=170&view=rev Author: dim0s77 Date: 2008-05-06 10:54:37 -0700 (Tue, 06 May 2008) Log Message: ----------- complete 'start new topic' and begin 'show topic' Modified Paths: -------------- app/controllers/groupapp/board_controller.php app/models/groupapp_group.php app/models/groupapp_member.php app/views/groupapp/board/_head.tpl app/views/groupapp/board/show_topic.tpl app/views/groupapp/board/start_topic.tpl app/views/message/send.tpl public/stylesheets/common/Submenu.css public/stylesheets/common/Tab.css timesheet/dim0s77.txt Added Paths: ----------- app/models/groupapp_message.php Modified: app/controllers/groupapp/board_controller.php =================================================================== --- app/controllers/groupapp/board_controller.php 2008-05-06 16:40:51 UTC (rev 169) +++ app/controllers/groupapp/board_controller.php 2008-05-06 17:54:37 UTC (rev 170) @@ -2,15 +2,63 @@ class Groupapp_BoardController extends ApplicationController { - var $models = array('GroupappMessage'); + var $models = array('GroupappMessage', 'GroupappGroup', 'GroupappMember'); function index () { } function show_topic () { + if (!empty($this->params['id'])) { + $topic = $this->GroupappMessage->findFirst(array( 'id' => $this->params['id'] )); + if ($topic) { + $member = $this->GroupappMember->findFirst(array( 'group_id' => $topic->group_id, + 'user_id' => $this->current_user->getId() + )); + $group = $this->GroupappGroup->findFirst(array( 'id' => $topic->group_id )); + if (($group && $group->access == 1) || $member) { + $this->topic = $topic; + } else { + $this->addError('_common', 'Access denied', 'Group id closed. You can\'t to see this topic'); + } + return; + } + } + $this->addError('_common', 'Topic not found', 'This topic is not founded'); } function start_topic () { + if (!empty($this->params['topic']) && + !empty($this->params['topic']['group_id']) && + !empty($this->params['topic']['body'])) { + if ( $group = $this->GroupappGroup->findFirst(array( 'id' => $this->params['topic']['group_id'] )) ) { + $member = $this->GroupappMember->findFirst(array( 'group_id' => $group->getId(), + 'user_id' => $this->current_user->getId() + )); + if ($member) { + $topic = $member->message->build(); + $topic->setAttributes($this->params['topic']); + if (empty($topic->subject)) { + $topic->subject = $this->t('(no topic)'); + } + if ($topic->save()) { + if (!$topic->topic_id) { + $topic->topic_id = $topic->getId(); + if ($topic->save()) { + $this->redirectTo(array('action' => 'show_topic', 'id' => $topic->getId())); + return; + } + } + } + } + } + $this->addError('_common', 'Sending message error', 'please, try again'); + } else if (!empty($this->params['id'])) { + if ( $group = $this->GroupappGroup->findFirst(array( 'id' => $this->params['id'] )) ) { + $this->topic = $group->message->build(); + } + } else { + $this->addError('_common', 'Start topic error', 'please, specify group'); + } } } Modified: app/models/groupapp_group.php =================================================================== --- app/models/groupapp_group.php 2008-05-06 16:40:51 UTC (rev 169) +++ app/models/groupapp_group.php 2008-05-06 17:54:37 UTC (rev 170) @@ -5,6 +5,8 @@ var $has_one = array('group_member' => array('class_name' => 'GroupappMember', 'foreign_key' => 'group_id'), ); + var $has_many = array( 'messages' => array('class_name' => 'GroupappMessage', + 'foreign_key' => 'group_id') ); function validateOnCreate () { Modified: app/models/groupapp_member.php =================================================================== --- app/models/groupapp_member.php 2008-05-06 16:40:51 UTC (rev 169) +++ app/models/groupapp_member.php 2008-05-06 17:54:37 UTC (rev 170) @@ -5,6 +5,9 @@ var $belongs_to = array('user' => array('class_name' => 'User', 'primary_key_name' => 'user_id'), 'role' => array('class_name' => 'GroupMemberRole', 'primary_key_name' => 'role_id') ); + var $has_many = array( 'messages' => array('class_name' => 'GroupappMessage', + 'foreign_key' => 'user_id') ); + } ?> Added: app/models/groupapp_message.php =================================================================== --- app/models/groupapp_message.php (rev 0) +++ app/models/groupapp_message.php 2008-05-06 17:54:37 UTC (rev 170) @@ -0,0 +1,20 @@ +<?php + +class GroupappMessage extends ActiveRecord +{ + var $has_one = array('user' => array('class_name' => 'User', + 'foreign_key' => 'user_id'), + 'group' => array('class_name' => 'GroupappGroup', + 'foreign_key' => 'group_id') + ); + +/* function validateOnCreate () */ +/* { */ +/* $this->validatesPresenceOf('name', 'Name is missing|please enter the name'); */ +/* $this->validatesPresenceOf('description', 'Description is missing|please enter the description'); */ +/* $this->validatesPresenceOf('type_id', 'Group type is missing|please select the group category'); */ +/* # $this->validatesFormatOf('email', AK_EMAIL_REGULAR_EXPRESSION, 'Incorrect email|please enter the correct email'); */ +/* } */ +} + +?> Modified: app/views/groupapp/board/_head.tpl =================================================================== --- app/views/groupapp/board/_head.tpl 2008-05-06 16:40:51 UTC (rev 169) +++ app/views/groupapp/board/_head.tpl 2008-05-06 17:54:37 UTC (rev 170) @@ -12,6 +12,4 @@ </div> <div class="clearfix"></div> -<?= $controller->renderErrors() ?> - <?= $controller->renderPartial("menu") ?> Modified: app/views/groupapp/board/show_topic.tpl =================================================================== --- app/views/groupapp/board/show_topic.tpl 2008-05-06 16:40:51 UTC (rev 169) +++ app/views/groupapp/board/show_topic.tpl 2008-05-06 17:54:37 UTC (rev 170) @@ -1 +1,17 @@ -<?= $controller->renderPartial("head") ?> \ No newline at end of file +<?= $controller->renderPartial("head") ?> + +{?topic} +<div class="submenu"> + + <div class="menu_block"> + <div class="header">_{Topic}: {topic.subject?}</div> + </div> + + <div class="menu_block right"> + <a href="#">_{Delete Topic}</a> | <a href="#">_{Reply to Topic}</a> + </div> + +</div> +<div class="clearfix"></div> +{end} +<?= $controller->renderErrors() ?> Modified: app/views/groupapp/board/start_topic.tpl =================================================================== --- app/views/groupapp/board/start_topic.tpl 2008-05-06 16:40:51 UTC (rev 169) +++ app/views/groupapp/board/start_topic.tpl 2008-05-06 17:54:37 UTC (rev 170) @@ -1 +1,21 @@ <?= $controller->renderPartial("head") ?> + +<?= $controller->renderErrors() ?> + +<form action="/groupapp/board/start_topic" method="post"> + <div class="editform"> + <div class="formrow"> + <label>_{Topic}:</label> + <?= $form_helper->text_field('topic', 'subject', array('class' => 'textinput'))?> + </div> + <div class="formrow"> + <label>_{Post}:</label> + <?= $form_helper->text_area('topic', 'body', array('class' => 'textinput'))?> + </div> + <div class="formrow"> + <label><input id="topic_group_id" name="topic[group_id]" type="hidden" value="{topic.group_id?}" /></label> + <input class="submitinput" type="submit" value="_{Post new topic}"> + <input class="cancelinput" type="button" value="_{Cancel}"> + </div> + </div> +</form> Modified: app/views/message/send.tpl =================================================================== --- app/views/message/send.tpl 2008-05-06 16:40:51 UTC (rev 169) +++ app/views/message/send.tpl 2008-05-06 17:54:37 UTC (rev 170) @@ -2,7 +2,7 @@ <?= $controller->renderErrors() ?> -<form action="/message/send" method="get"> +<form action="/message/send" method="post"> <div class="editform"> <div class="formrow"> <label>_{To}:</label> Modified: public/stylesheets/common/Submenu.css =================================================================== --- public/stylesheets/common/Submenu.css 2008-05-06 16:40:51 UTC (rev 169) +++ public/stylesheets/common/Submenu.css 2008-05-06 17:54:37 UTC (rev 170) @@ -16,10 +16,21 @@ float: left; } +.submenu .menu_block.right { + float: right; + margin: 5px; +} + .submenu .menu_block.selector { padding-right: 10px; } +.submenu .menu_block .header { + font-weight: bold; + font-size: 13px; + margin: 5px; +} + .submenu .menu_block.selector select { margin-left: 5px; } Modified: public/stylesheets/common/Tab.css =================================================================== --- public/stylesheets/common/Tab.css 2008-05-06 16:40:51 UTC (rev 169) +++ public/stylesheets/common/Tab.css 2008-05-06 17:54:37 UTC (rev 170) @@ -1,5 +1,5 @@ #content .tabs { - display:block; + display: block; padding: 20px 0px 0px 0px; border-bottom: 1px solid #898989; float: left; Modified: timesheet/dim0s77.txt =================================================================== --- timesheet/dim0s77.txt 2008-05-06 16:40:51 UTC (rev 169) +++ timesheet/dim0s77.txt 2008-05-06 17:54:37 UTC (rev 170) @@ -8,3 +8,5 @@ 2008-05-01,09:50,11:50,groupapp,RT:3,"Modife template 'show_group' for groupapp" 2008-05-01,11:50,15:00,groupapp,RT:3,"Adding groupapp discussion board basis. Localizate" 2008-05-01,15:00,16:55,groupapp,RT:3,"Creation tab 'discussion board' with no topics for groupapp" + +2008-05-06,19:30,20:50,groupapp,RT:3,"complete 'start new topic' and begin 'show topics'" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fsn...@us...> - 2008-05-06 16:42:47
|
Revision: 168 http://isocial.svn.sourceforge.net/isocial/?rev=168&view=rev Author: fsnobody Date: 2008-05-06 09:27:44 -0700 (Tue, 06 May 2008) Log Message: ----------- time Modified Paths: -------------- timesheet/eerunov.txt Modified: timesheet/eerunov.txt =================================================================== --- timesheet/eerunov.txt 2008-05-06 15:16:02 UTC (rev 167) +++ timesheet/eerunov.txt 2008-05-06 16:27:44 UTC (rev 168) @@ -5,3 +5,5 @@ 2008-04-29,14:00,15:10,photoapp,RT:2,"create installer for albums + action create for album" 2008-04-30,15:00,16:00,photoapp,RT:2,"cnahges in action controller" 2008-05-01,12:00,15:40,photoapp,RT:2,"redesign + album list + start edit albums" +2008-05-05,09:00,11:00,photoapp,RT:2,"minor fixes + edit album" +2008-05-06,09:00,10:20,photoapp,RT:2,"share create form + changes in installer + fixes + add_photo form design" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <agu...@us...> - 2008-05-06 16:41:49
|
Revision: 169 http://isocial.svn.sourceforge.net/isocial/?rev=169&view=rev Author: aguidrevitch Date: 2008-05-06 09:40:51 -0700 (Tue, 06 May 2008) Log Message: ----------- akelos patch synced Modified Paths: -------------- akelos.diff Modified: akelos.diff =================================================================== --- akelos.diff 2008-05-06 16:27:44 UTC (rev 168) +++ akelos.diff 2008-05-06 16:40:51 UTC (rev 169) @@ -1,6 +1,6 @@ Index: lib/Ak.php =================================================================== ---- lib/Ak.php (revision 558) +--- lib/Ak.php (revision 578) +++ lib/Ak.php (working copy) @@ -183,6 +183,11 @@ return @$string[$try_whith_lang]; @@ -25,9 +25,9 @@ } Index: lib/AkActionController.php =================================================================== ---- lib/AkActionController.php (revision 558) +--- lib/AkActionController.php (revision 578) +++ lib/AkActionController.php (working copy) -@@ -750,7 +750,14 @@ +@@ -749,7 +749,14 @@ */ function t($string, $array = null) { @@ -43,7 +43,7 @@ } -@@ -1946,6 +1953,9 @@ +@@ -1949,6 +1956,9 @@ { if(method_exists(&$this, $action)){ call_user_func_array(array(&$this, $action), @(array)$this->passed_args); @@ -55,7 +55,7 @@ Index: lib/AkActionView/helpers/text_helper.php =================================================================== ---- lib/AkActionView/helpers/text_helper.php (revision 558) +--- lib/AkActionView/helpers/text_helper.php (revision 578) +++ lib/AkActionView/helpers/text_helper.php (working copy) @@ -518,8 +518,18 @@ */ @@ -80,7 +80,7 @@ /** Index: lib/AkActiveRecord.php =================================================================== ---- lib/AkActiveRecord.php (revision 558) +--- lib/AkActiveRecord.php (revision 578) +++ lib/AkActiveRecord.php (working copy) @@ -5012,6 +5012,7 @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fsn...@us...> - 2008-05-06 15:16:09
|
Revision: 167 http://isocial.svn.sourceforge.net/isocial/?rev=167&view=rev Author: fsnobody Date: 2008-05-06 08:16:02 -0700 (Tue, 06 May 2008) Log Message: ----------- design add photo to album form Modified Paths: -------------- app/controllers/photoapp/album_controller.php app/locales/photoapp/album/ru.php app/views/photoapp/album/add_photo.tpl public/stylesheets/photoapp/Album.css Modified: app/controllers/photoapp/album_controller.php =================================================================== --- app/controllers/photoapp/album_controller.php 2008-05-06 08:23:26 UTC (rev 166) +++ app/controllers/photoapp/album_controller.php 2008-05-06 15:16:02 UTC (rev 167) @@ -43,6 +43,13 @@ } function add_photo () { + + if (!empty($this->params['album'])){ + // + } else if ($this->params['id']) { + $this->album = $this->PhotoappAlbum->find($this->params['id']); + return; + } } function edit () { Modified: app/locales/photoapp/album/ru.php =================================================================== --- app/locales/photoapp/album/ru.php 2008-05-06 08:23:26 UTC (rev 166) +++ app/locales/photoapp/album/ru.php 2008-05-06 15:16:02 UTC (rev 167) @@ -26,10 +26,13 @@ $dictionary['View Album'] = 'Просмотр Альбома'; $dictionary['Delete Album'] = 'Удаление Альбома'; $dictionary['photos'] = 'фотографий'; +$dictionary['Upload'] = 'Загрузить'; +$dictionary['Choose'] = 'Обзор'; + ?> Modified: app/views/photoapp/album/add_photo.tpl =================================================================== --- app/views/photoapp/album/add_photo.tpl 2008-05-06 08:23:26 UTC (rev 166) +++ app/views/photoapp/album/add_photo.tpl 2008-05-06 15:16:02 UTC (rev 167) @@ -13,4 +13,73 @@ <?= $controller->renderPartial("edit_menu") ?> -Add Photo \ No newline at end of file +<div class="album_step"> + <?= $form_tag_helper->start_form_tag(array('action'=>'add_photo', 'id' => $album->getId())) ?> + <div class="form_create_clear red"> + + <div class="form_create_row"> + <label>_{Photos}:</label> + <div class="form_create_col"> + <?= $form_helper->file_field('album', 'photo1', array('class' => 'textinput small')) ?> + </div> + </div> + <div class="clearfix"></div> + + <div class="form_create_row"> + <label > </label> + <div class="form_create_col"> + <?= $form_helper->file_field('album', 'photo2', array('class' => 'textinput small')) ?> + </div> + </div> + <div class="clearfix"></div> + + <div class="form_create_row"> + <label > </label> + <div class="form_create_col"> + <?= $form_helper->file_field('album', 'photo3', array('class' => 'textinput small')) ?> + </div> + </div> + <div class="clearfix"></div> + + <div class="form_create_row"> + <label > </label> + <div class="form_create_col"> + <?= $form_helper->file_field('album', 'photo4', array('class' => 'textinput small')) ?> + </div> + </div> + <div class="clearfix"></div> + + <div class="form_create_row"> + <label > </label> + <div class="form_create_col"> + <?= $form_helper->file_field('album', 'photo5', array('class' => 'textinput small')) ?> + </div> + </div> + <div class="clearfix"></div> + + <div class="form_row"> + <small>You can upload JPG, GIF or PNG files.</small> + </div> + <div class="clearfix"></div> + + <div class="form_row"> + <?= $form_helper->check_box('album', 'check_box', array()) ?> + <label for="album_check_box">I certify that I have the right to distribute these photos and that they do not violate the Terms of Use.</label> + </div> + <div class="clearfix"></div> + + + + + <div class="form_create_row"> + <label > </label> + <div class="form_create_col"> + <input class="submitinput" type="submit" value="_{Upload}"/> + <input class="cancelinput" type="button" value="_{Cancel}"/> + </div> + </div> + <div class="clearfix"></div> + + </div> + </form> +</div> \ No newline at end of file Modified: public/stylesheets/photoapp/Album.css =================================================================== --- public/stylesheets/photoapp/Album.css 2008-05-06 08:23:26 UTC (rev 166) +++ public/stylesheets/photoapp/Album.css 2008-05-06 15:16:02 UTC (rev 167) @@ -97,6 +97,17 @@ padding-top: 2px; } +.form_row small { + font-size: 10px; + font-weight: bold; + color: #cccccc; + +} + +.form_row { + text-align: center; +} + .form_create_row label { font-size: 10px; display: block; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fsn...@us...> - 2008-05-06 08:23:19
|
Revision: 166 http://isocial.svn.sourceforge.net/isocial/?rev=166&view=rev Author: fsnobody Date: 2008-05-06 01:23:26 -0700 (Tue, 06 May 2008) Log Message: ----------- minor fixes + added created_at and photos_count to installer Modified Paths: -------------- app/controllers/photoapp/album_controller.php app/installers/photoapp/album_installer.php app/views/photoapp/album/index.tpl public/stylesheets/photoapp/Album.css Modified: app/controllers/photoapp/album_controller.php =================================================================== --- app/controllers/photoapp/album_controller.php 2008-05-06 07:34:04 UTC (rev 165) +++ app/controllers/photoapp/album_controller.php 2008-05-06 08:23:26 UTC (rev 166) @@ -7,7 +7,10 @@ function index () { //$this->redirectTo(array('action' => 'show')); $this->my_albums = $this->PhotoappAlbum->find('all', array('conditions' => array('owner = ' . $this->current_user->getId()))); - $this->count_albums = count($this->my_albums); + if(is_array($this->my_albums)) + $this->count_albums = count($this->my_albums); + else + $this->count_albums = 0; } function show () { Modified: app/installers/photoapp/album_installer.php =================================================================== --- app/installers/photoapp/album_installer.php 2008-05-06 07:34:04 UTC (rev 165) +++ app/installers/photoapp/album_installer.php 2008-05-06 08:23:26 UTC (rev 166) @@ -10,9 +10,11 @@ "CREATE TABLE `photoapp_albums` ( `id` int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT, `owner` int(11) NOT NULL , + `photos_count` int(11) NOT NULL DEFAULT 0, `name` char(100) NOT NULL DEFAULT '', `privacy` char(100) NOT NULL DEFAULT '', `description` char(255) NOT NULL DEFAULT '', + `created_at` datetime NOT NULL , `img` char(255) NOT NULL DEFAULT '' ) ENGINE=InnoDB"); Modified: app/views/photoapp/album/index.tpl =================================================================== --- app/views/photoapp/album/index.tpl 2008-05-06 07:34:04 UTC (rev 165) +++ app/views/photoapp/album/index.tpl 2008-05-06 08:23:26 UTC (rev 166) @@ -8,7 +8,7 @@ <div class="name photoapp">_{My Albums}</div> </div> <div class="clearfix"></div> - <div class="subheader"><a href="/photoapp/album/create">_{Create a New Album}</a></div> + <div class="subheader"><a href="/photoapp/album/add">_{Create a New Album}</a></div> </div> </div> <div class="clearfix"></div> @@ -29,9 +29,9 @@ <div class="img">IMG</div> <div class="info"> <div class="name_album"><a href="/photoapp/album/view/<?= $my_album->get('id')?>"><?= $my_album->get('name') ?></a></div> - <div class="photos_count">0 _{photos}</div> + <div class="photos_count"><?= $my_album->get('photos_count')?> _{photos}</div> <div class="description">_{Description}: <?= $my_album->get('description')?></div> - <div class="photos_count">_{Created} April 25</div> + <div class="photos_count">_{Created} <?= strftime("%b %e", strtotime($my_album->get('created_at')))?></div> </div> <div class="links"> <div><a href="/photoapp/album/add_photo/<?= $my_album->get('id')?>">_{Edit Album}</a></div> Modified: public/stylesheets/photoapp/Album.css =================================================================== --- public/stylesheets/photoapp/Album.css 2008-05-06 07:34:04 UTC (rev 165) +++ public/stylesheets/photoapp/Album.css 2008-05-06 08:23:26 UTC (rev 166) @@ -165,7 +165,7 @@ } .album .info { - width: 345px; + width: 315px; float: left; height: 120px; padding: 0px 5px 0px 0px; @@ -192,7 +192,7 @@ .album .links { padding: 3px 0px; font-size: 10px; - width: 120px; + width: 150px; float: left; height: 120px; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <agu...@us...> - 2008-05-06 07:33:58
|
Revision: 165 http://isocial.svn.sourceforge.net/isocial/?rev=165&view=rev Author: aguidrevitch Date: 2008-05-06 00:34:04 -0700 (Tue, 06 May 2008) Log Message: ----------- minor refactoring Modified Paths: -------------- app/controllers/photoapp/album_controller.php app/views/photoapp/album/_edit_menu.tpl Added Paths: ----------- app/views/photoapp/album/_form.tpl app/views/photoapp/album/add.tpl app/views/photoapp/album/edit.tpl Removed Paths: ------------- app/views/photoapp/album/create.tpl app/views/photoapp/album/edit_info.tpl Modified: app/controllers/photoapp/album_controller.php =================================================================== --- app/controllers/photoapp/album_controller.php 2008-05-06 06:17:06 UTC (rev 164) +++ app/controllers/photoapp/album_controller.php 2008-05-06 07:34:04 UTC (rev 165) @@ -25,7 +25,7 @@ function create () { } */ - function create () { + function add () { if (!empty($this->params['album'])){ $this->PhotoappAlbum->setAttributes($this->params['album']); $this->PhotoappAlbum->owner = $this->current_user->getId(); @@ -42,7 +42,21 @@ function add_photo () { } - function edit_info () { + function edit () { + if (!empty($this->params['album'])){ + $this->PhotoappAlbum->setAttributes($this->params['album']); + $this->PhotoappAlbum->owner = $this->current_user->getId(); + if ($this->Request->isPost() && $this->PhotoappAlbum->save()){ + // success + $this->redirectTo(array('action' => 'index')); + } else { + $this->importErrors( $this->PhotoappAlbum->getErrors() ); + } + } else if ($this->params['id']) { + $this->album = $this->PhotoappAlbum->find($this->params['id']); + return; + } + } function help () { Modified: app/views/photoapp/album/_edit_menu.tpl =================================================================== --- app/views/photoapp/album/_edit_menu.tpl 2008-05-06 06:17:06 UTC (rev 164) +++ app/views/photoapp/album/_edit_menu.tpl 2008-05-06 07:34:04 UTC (rev 165) @@ -2,7 +2,7 @@ <div class="left"> <ul class="toggle_tabs"> <li class="first"><a href="/photoapp/album/add_photo/{id}" class="<?= $controller->getActionName() == 'add_photo' ? 'selected' : '' ?>">_{Add Photos}</a></li><? - ?><li><a href="/photoapp/album/edit_info/{id}" class="last <?= $controller->getActionName() == 'edit_info' ? 'selected' : '' ?>">_{Edit Info}</a></li><? + ?><li><a href="/photoapp/album/edit/{id}" class="last <?= $controller->getActionName() == 'edit' ? 'selected' : '' ?>">_{Edit Info}</a></li><? ?><li><a href="/photoapp/album/delete/{id}" class="last <?= $controller->getActionName() == 'delete' ? 'selected' : '' ?>">_{Delete}</a></li> </ul> </div> Added: app/views/photoapp/album/_form.tpl =================================================================== --- app/views/photoapp/album/_form.tpl (rev 0) +++ app/views/photoapp/album/_form.tpl 2008-05-06 07:34:04 UTC (rev 165) @@ -0,0 +1,40 @@ + <div class="form_create_clear"> + + <div class="form_create_row"> + <label >_{Name}:</label> + <div class="form_create_col"> + <?= $form_helper->text_field('album', 'name', array('class' => 'textinput small')) ?> + </div> + </div> + <div class="clearfix"></div> + + <div class="form_create_row"> + <label >_{Description}:</label> + <div class="form_create_col"> + <?= $form_helper->text_area('album', 'description', array('rows' => '5', 'class' => 'small')) ?> + </div> + </div> + <div class="clearfix"></div> + + <div class="form_create_row"> + <label >_{Privacy}:</label> + <div class="form_create_col"> + <select> + <option>Everyone</option> + <option>Friends of Friends</option> + <option>Only Friends</option> + <option>Customize...</option> + </select> + </div> + </div> + <div class="clearfix"></div> + + <div class="form_create_row"> + <label > </label> + <div class="form_create_col"> + <input class="submitinput" type="submit" value="_{Create Album}"/> + </div> + </div> + <div class="clearfix"></div> + + </div> Added: app/views/photoapp/album/add.tpl =================================================================== --- app/views/photoapp/album/add.tpl (rev 0) +++ app/views/photoapp/album/add.tpl 2008-05-06 07:34:04 UTC (rev 165) @@ -0,0 +1,20 @@ + +<?= $controller->renderErrors() ?> + +<div class="title_bar"> + <div class="info"> + <div class="header"> + <div class="name">_{Create Album}</div> + </div> + <div class="clearfix"></div> + </div> +</div> +<div class="clearfix"></div> + + +<div class="album_step"> + <?= $form_tag_helper->start_form_tag(array('action'=>'add')) ?> + <?= $controller->renderPartial('form') ?> + </form> +</div> +<div class="clearfix"></div> \ No newline at end of file Deleted: app/views/photoapp/album/create.tpl =================================================================== --- app/views/photoapp/album/create.tpl 2008-05-06 06:17:06 UTC (rev 164) +++ app/views/photoapp/album/create.tpl 2008-05-06 07:34:04 UTC (rev 165) @@ -1,59 +0,0 @@ - -<?= $controller->renderErrors() ?> - -<div class="title_bar"> - <div class="info"> - <div class="header"> - <div class="name">_{Create Album}</div> - </div> - <div class="clearfix"></div> - </div> -</div> -<div class="clearfix"></div> - - -<div class="album_step"> - <form action="/photoapp/album/create" method="post"> - <div class="form_create_clear"> - - <div class="form_create_row"> - <label >_{Name}:</label> - <div class="form_create_col"> - <?= $form_helper->text_field('album', 'name', array('class' => 'text_input small')) ?> - </div> - </div> - <div class="clearfix"></div> - - <div class="form_create_row"> - <label >_{Description}:</label> - <div class="form_create_col"> - <?= $form_helper->text_area('album', 'description', array('rows' => '5', 'class' => 'small')) ?> - </div> - </div> - <div class="clearfix"></div> - - <div class="form_create_row"> - <label >_{Privacy}:</label> - <div class="form_create_col"> - <select> - <option>Everyone</option> - <option>Friends of Friends</option> - <option>Only Friends</option> - <option>Customize...</option> - </select> - </div> - </div> - <div class="clearfix"></div> - - <div class="form_create_row"> - <label > </label> - <div class="form_create_col"> - <input class="submitinput" type="submit" value="_{Create Album}"/> - </div> - </div> - <div class="clearfix"></div> - - </div> - </form> -</div> -<div class="clearfix"></div> \ No newline at end of file Added: app/views/photoapp/album/edit.tpl =================================================================== --- app/views/photoapp/album/edit.tpl (rev 0) +++ app/views/photoapp/album/edit.tpl 2008-05-06 07:34:04 UTC (rev 165) @@ -0,0 +1,22 @@ + +<?= $controller->renderErrors() ?> + +<div class="title_bar"> + <div class="info"> + <div class="header"> + <div class="name">_{Edit Album}</div> + </div> + <div class="clearfix"></div> + </div> +</div> +<div class="clearfix"></div> + +<?= $controller->renderPartial("edit_menu") ?> + + +<div class="album_step"> + <?= $form_tag_helper->start_form_tag(array('action'=>'edit', 'id' => $album->getId())) ?> + <?= $controller->renderPartial("form") ?> + </form> +</div> +<div class="clearfix"></div> Deleted: app/views/photoapp/album/edit_info.tpl =================================================================== --- app/views/photoapp/album/edit_info.tpl 2008-05-06 06:17:06 UTC (rev 164) +++ app/views/photoapp/album/edit_info.tpl 2008-05-06 07:34:04 UTC (rev 165) @@ -1,62 +0,0 @@ - -<?= $controller->renderErrors() ?> - -<div class="title_bar"> - <div class="info"> - <div class="header"> - <div class="name">_{Edit Album}</div> - </div> - <div class="clearfix"></div> - </div> -</div> -<div class="clearfix"></div> - -<?= $controller->renderPartial("edit_menu") ?> - - - -<div class="album_step"> - <form action="/photoapp/album/update/{id}" method="post"> - <div class="form_create_clear"> - - <div class="form_create_row"> - <label >_{Name}:</label> - <div class="form_create_col"> - <?= $form_helper->text_field('album', 'name', array('class' => 'text_input small')) ?> - </div> - </div> - <div class="clearfix"></div> - - <div class="form_create_row"> - <label >_{Description}:</label> - <div class="form_create_col"> - <?= $form_helper->text_area('album', 'description', array('rows' => '5', 'class' => 'small')) ?> - </div> - </div> - <div class="clearfix"></div> - - <div class="form_create_row"> - <label >_{Privacy}:</label> - <div class="form_create_col"> - <select> - <option>Everyone</option> - <option>Friends of Friends</option> - <option>Only Friends</option> - <option>Customize...</option> - </select> - </div> - </div> - <div class="clearfix"></div> - - <div class="form_create_row"> - <label > </label> - <div class="form_create_col"> - <input class="submitinput" type="submit" value="_{Update Info}"/> - </div> - </div> - <div class="clearfix"></div> - - </div> - </form> -</div> -<div class="clearfix"></div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fsn...@us...> - 2008-05-06 06:17:01
|
Revision: 164 http://isocial.svn.sourceforge.net/isocial/?rev=164&view=rev Author: fsnobody Date: 2008-05-05 23:17:06 -0700 (Mon, 05 May 2008) Log Message: ----------- add photo view Added Paths: ----------- app/views/photoapp/album/add_photo.tpl Added: app/views/photoapp/album/add_photo.tpl =================================================================== --- app/views/photoapp/album/add_photo.tpl (rev 0) +++ app/views/photoapp/album/add_photo.tpl 2008-05-06 06:17:06 UTC (rev 164) @@ -0,0 +1,16 @@ + +<?= $controller->renderErrors() ?> + +<div class="title_bar"> + <div class="info"> + <div class="header"> + <div class="name">_{Edit Album}</div> + </div> + <div class="clearfix"></div> + </div> +</div> +<div class="clearfix"></div> + +<?= $controller->renderPartial("edit_menu") ?> + +Add Photo \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fsn...@us...> - 2008-05-05 16:54:02
|
Revision: 163 http://isocial.svn.sourceforge.net/isocial/?rev=163&view=rev Author: fsnobody Date: 2008-05-05 09:54:03 -0700 (Mon, 05 May 2008) Log Message: ----------- changed action Modified Paths: -------------- app/controllers/photoapp/album_controller.php app/views/photoapp/album/_edit_menu.tpl app/views/photoapp/album/edit_info.tpl app/views/photoapp/album/index.tpl Removed Paths: ------------- app/views/photoapp/album/add_photos.tpl Modified: app/controllers/photoapp/album_controller.php =================================================================== --- app/controllers/photoapp/album_controller.php 2008-05-05 09:53:02 UTC (rev 162) +++ app/controllers/photoapp/album_controller.php 2008-05-05 16:54:03 UTC (rev 163) @@ -39,10 +39,10 @@ } - function add_photos () { + function add_photo () { } - function edit () { + function edit_info () { } function help () { Modified: app/views/photoapp/album/_edit_menu.tpl =================================================================== --- app/views/photoapp/album/_edit_menu.tpl 2008-05-05 09:53:02 UTC (rev 162) +++ app/views/photoapp/album/_edit_menu.tpl 2008-05-05 16:54:03 UTC (rev 163) @@ -1,9 +1,9 @@ <div class="tabs"> <div class="left"> <ul class="toggle_tabs"> - <li class="first"><a href="/photoapp/album/add_photos" class="<?= $controller->getActionName() == 'add_photos' ? 'selected' : '' ?>">_{Add Photos}</a></li><? - ?><li><a href="/photoapp/album/edit_info" class="last <?= $controller->getActionName() == 'edit_info' ? 'selected' : '' ?>">_{Edit Info}</a></li><? - ?><li><a href="/photoapp/album/delete" class="last <?= $controller->getActionName() == 'delete' ? 'selected' : '' ?>">_{Delete}</a></li> + <li class="first"><a href="/photoapp/album/add_photo/{id}" class="<?= $controller->getActionName() == 'add_photo' ? 'selected' : '' ?>">_{Add Photos}</a></li><? + ?><li><a href="/photoapp/album/edit_info/{id}" class="last <?= $controller->getActionName() == 'edit_info' ? 'selected' : '' ?>">_{Edit Info}</a></li><? + ?><li><a href="/photoapp/album/delete/{id}" class="last <?= $controller->getActionName() == 'delete' ? 'selected' : '' ?>">_{Delete}</a></li> </ul> </div> <div class="right"> Deleted: app/views/photoapp/album/add_photos.tpl =================================================================== --- app/views/photoapp/album/add_photos.tpl 2008-05-05 09:53:02 UTC (rev 162) +++ app/views/photoapp/album/add_photos.tpl 2008-05-05 16:54:03 UTC (rev 163) @@ -1,17 +0,0 @@ - -<?= $controller->renderErrors() ?> - -<div class="title_bar"> - <div class="info"> - <div class="header"> - <div class="name">_{Edit Album}</div> - </div> - <div class="clearfix"></div> - </div> -</div> -<div class="clearfix"></div> - -<?= $controller->renderPartial("edit_menu") ?> - - - Modified: app/views/photoapp/album/edit_info.tpl =================================================================== --- app/views/photoapp/album/edit_info.tpl 2008-05-05 09:53:02 UTC (rev 162) +++ app/views/photoapp/album/edit_info.tpl 2008-05-05 16:54:03 UTC (rev 163) @@ -15,3 +15,48 @@ +<div class="album_step"> + <form action="/photoapp/album/update/{id}" method="post"> + <div class="form_create_clear"> + + <div class="form_create_row"> + <label >_{Name}:</label> + <div class="form_create_col"> + <?= $form_helper->text_field('album', 'name', array('class' => 'text_input small')) ?> + </div> + </div> + <div class="clearfix"></div> + + <div class="form_create_row"> + <label >_{Description}:</label> + <div class="form_create_col"> + <?= $form_helper->text_area('album', 'description', array('rows' => '5', 'class' => 'small')) ?> + </div> + </div> + <div class="clearfix"></div> + + <div class="form_create_row"> + <label >_{Privacy}:</label> + <div class="form_create_col"> + <select> + <option>Everyone</option> + <option>Friends of Friends</option> + <option>Only Friends</option> + <option>Customize...</option> + </select> + </div> + </div> + <div class="clearfix"></div> + + <div class="form_create_row"> + <label > </label> + <div class="form_create_col"> + <input class="submitinput" type="submit" value="_{Update Info}"/> + </div> + </div> + <div class="clearfix"></div> + + </div> + </form> +</div> +<div class="clearfix"></div> Modified: app/views/photoapp/album/index.tpl =================================================================== --- app/views/photoapp/album/index.tpl 2008-05-05 09:53:02 UTC (rev 162) +++ app/views/photoapp/album/index.tpl 2008-05-05 16:54:03 UTC (rev 163) @@ -34,7 +34,7 @@ <div class="photos_count">_{Created} April 25</div> </div> <div class="links"> - <div><a href="/photoapp/album/edit/<?= $my_album->get('id')?>">_{Edit Album}</a></div> + <div><a href="/photoapp/album/add_photo/<?= $my_album->get('id')?>">_{Edit Album}</a></div> <div><a href="/photoapp/album/view/<?= $my_album->get('id')?>">_{View Album}</a></div> <div><a href="/photoapp/album/delete/<?= $my_album->get('id')?>">_{Delete Album}</a></div> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fsn...@us...> - 2008-05-05 09:53:09
|
Revision: 162 http://isocial.svn.sourceforge.net/isocial/?rev=162&view=rev Author: fsnobody Date: 2008-05-05 02:53:02 -0700 (Mon, 05 May 2008) Log Message: ----------- updated Modified Paths: -------------- app/controllers/photoapp/album_controller.php app/views/photoapp/album/delete.tpl app/views/photoapp/album/index.tpl public/stylesheets/photoapp/Album.css Modified: app/controllers/photoapp/album_controller.php =================================================================== --- app/controllers/photoapp/album_controller.php 2008-05-03 14:19:44 UTC (rev 161) +++ app/controllers/photoapp/album_controller.php 2008-05-05 09:53:02 UTC (rev 162) @@ -42,13 +42,24 @@ function add_photos () { } - function edit_info () { + function edit () { } function help () { } function delete () { + if (!empty($this->params['album']) ){ + // delete + $album = $this->PhotoappAlbum->find($this->params['id']); + if ($album->get('owner') == $this->current_user->getId() && $this->Request->isPost() && $this->PhotoappAlbum->destroyAll("id = " . $this->params['id'])) { + $this->redirectTo(array('action' => 'index')); + return; + } + } else if (!empty($this->params['id']) && $this->PhotoappAlbum->find($this->params['id'])) { + // pre delete + $this->album = $this->PhotoappAlbum->find($this->params['id']); + } } } Modified: app/views/photoapp/album/delete.tpl =================================================================== --- app/views/photoapp/album/delete.tpl 2008-05-03 14:19:44 UTC (rev 161) +++ app/views/photoapp/album/delete.tpl 2008-05-05 09:53:02 UTC (rev 162) @@ -14,6 +14,23 @@ <?= $controller->renderPartial("edit_menu") ?> <div class="delete_album"> + <div class="delete_form"> + <form action="/photoapp/album/delete/{id}" method="post"> + <?= $form_helper->hidden_field('album', 'action_delete', array('value' => 'do_delete')) ?> + <div class="warning"> + <div class="form_title"> + _{Delete Photo Album}? + </div> + <div class="text"> + {album.name?} is empty. Delete it? + </div> + <div class="formbtns"> + <input class="submitinput" type="submit" value="_{Delete Album}"/> + <input class="cancelinput" type="button" value="_{Cancel}"/> + </div> + </div> + </form> + </div> </div> <div class="clearfix"></div> Modified: app/views/photoapp/album/index.tpl =================================================================== --- app/views/photoapp/album/index.tpl 2008-05-03 14:19:44 UTC (rev 161) +++ app/views/photoapp/album/index.tpl 2008-05-05 09:53:02 UTC (rev 162) @@ -32,12 +32,12 @@ <div class="photos_count">0 _{photos}</div> <div class="description">_{Description}: <?= $my_album->get('description')?></div> <div class="photos_count">_{Created} April 25</div> - <div class="links"> - <a href="/photoapp/album/edit/<?= $my_album->get('id')?>">_{Edit Album}</a> | - <a href="/photoapp/album/view/<?= $my_album->get('id')?>">_{View Album}</a> | - <a href="/photoapp/album/delete/<?= $my_album->get('id')?>">_{Delete Album}</a> - </div> </div> + <div class="links"> + <div><a href="/photoapp/album/edit/<?= $my_album->get('id')?>">_{Edit Album}</a></div> + <div><a href="/photoapp/album/view/<?= $my_album->get('id')?>">_{View Album}</a></div> + <div><a href="/photoapp/album/delete/<?= $my_album->get('id')?>">_{Delete Album}</a></div> + </div> </div> {end} </div> Modified: public/stylesheets/photoapp/Album.css =================================================================== --- public/stylesheets/photoapp/Album.css 2008-05-03 14:19:44 UTC (rev 161) +++ public/stylesheets/photoapp/Album.css 2008-05-05 09:53:02 UTC (rev 162) @@ -159,15 +159,16 @@ } .album .img { - width: 200px; + width: 130px; float: left; height: 120px; } .album .info { - width: 400px; + width: 345px; float: left; height: 120px; + padding: 0px 5px 0px 0px; } .album .info .name_album { @@ -188,8 +189,52 @@ color: #888888; } -.album .info .links { +.album .links { padding: 3px 0px; font-size: 10px; + width: 120px; + float: left; + height: 120px; } +.album .links div{ + height: 20px; + border-bottom: 1px solid #dedeee; + padding: 0px 0px 0px 5px; +} + +.album .links div a{ + height: 20px; + width: 120px; + line-height: 18px; +} + +.delete_album { + padding: 10px 150px; +} + +.delete_form { + background: #dedeee; + padding: 10px; +} + +.warning { + border: 1px solid #39599c; + padding: 10px; + background: #ffffff; +} + +.form_title { + font-size: 14px; + font-weight: bold; + border-bottom: 1px solid #dedeee; + padding: 3px 0px; +} + +.warning .text { + padding: 14px 0px; +} + +.formbtns { + text-align: right; +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <agu...@us...> - 2008-05-03 14:19:37
|
Revision: 161 http://isocial.svn.sourceforge.net/isocial/?rev=161&view=rev Author: aguidrevitch Date: 2008-05-03 07:19:44 -0700 (Sat, 03 May 2008) Log Message: ----------- my timesheet Modified Paths: -------------- timesheet/aguidrevitch.txt Modified: timesheet/aguidrevitch.txt =================================================================== --- timesheet/aguidrevitch.txt 2008-05-03 14:18:47 UTC (rev 160) +++ timesheet/aguidrevitch.txt 2008-05-03 14:19:44 UTC (rev 161) @@ -1,3 +1,5 @@ 2008-05-01,10:00,15:00,main,RT:1,"working on dialogs" 2008-05-01,16:00,22:10,main,RT:1,"working on dialogs" 2008-05-02,18:30,22:30,main,RT:1,"working on contact form, working around ie6 select bug" +2008-05-03,12:10,13:30,main,RT:1,"working on dialogs (fixing ie6 bug)" +2008-05-03,14:10,17:20,main,RT:1,"working on dialogs (fixing ie6 bug)" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <agu...@us...> - 2008-05-03 14:18:39
|
Revision: 160 http://isocial.svn.sourceforge.net/isocial/?rev=160&view=rev Author: aguidrevitch Date: 2008-05-03 07:18:47 -0700 (Sat, 03 May 2008) Log Message: ----------- dialogs fixed as prototypejs suggests Modified Paths: -------------- app/views/dialog/_access.tpl app/views/dialog/_new_city.tpl app/views/profile/contact.tpl public/javascripts/dialog.js public/stylesheets/common/Application.css public/stylesheets/common/Form.css public/stylesheets/common/Input.css public/stylesheets/dialog.css Modified: app/views/dialog/_access.tpl =================================================================== --- app/views/dialog/_access.tpl 2008-05-03 13:43:35 UTC (rev 159) +++ app/views/dialog/_access.tpl 2008-05-03 14:18:47 UTC (rev 160) @@ -1,5 +1,4 @@ <div id="access_dialog_<?= @$params['reference_element'] ?>" class="action_dialog access_dialog"> - <div id="dlgborder"> <div id="dlgheader">_{Who can see this?}</div> <div id="dlgbody"> <div class="field"><?= $text_helper->translate(@$params['title']) ?></div> @@ -30,6 +29,5 @@ } }).show(); </script> - </div> </div> Modified: app/views/dialog/_new_city.tpl =================================================================== --- app/views/dialog/_new_city.tpl 2008-05-03 13:43:35 UTC (rev 159) +++ app/views/dialog/_new_city.tpl 2008-05-03 14:18:47 UTC (rev 160) @@ -1,15 +1,14 @@ <div id="ncdlg" class="action_dialog city_dialog"> - <div id="dlgborder"> <div id="dlgheader">_{Add New City}</div> <div id="dlgbody"> <form id="city_addition_form"> <div class="editform"> <div id="ncdlg_errors"></div> <div class="formrow"> - <label class="xshortlabel">_{City Name}</label><?= $form_helper->text_field('city', 'name', array('class' => 'mediumtextinput')) ?> + <label>_{City Name}</label><?= $form_helper->text_field('city', 'name', array('class' => 'mediumtextinput')) ?> </div> <div class="formrow"> - <label class="xshortlabel">_{Country}</label> + <label>_{Country}</label> <?= $form_options_helper->select('city', 'country_id', $Country->collect($Country->find(), 'name', 'id'), array(), @@ -48,7 +47,7 @@ yes: '_{Save}', cancel: '_{Cancel}', - onShow: function (event, element) { + onShow: function () { $('ncdlg_errors').update(); $('ncdlg_regions_list').update(); @@ -56,7 +55,7 @@ $('city_name').setValue($F(input)); }, - onYes: function (event, element) { + onYes: function (object) { new Ajax.Request('/city/add', { postBody: $('city_addition_form').serialize(), onSuccess: function (response) { @@ -65,7 +64,7 @@ if (data.id) { $(hidden).setValue(data.id); $(input).setValue(data.name); - Effect.Fade(element, {duration: 0.3}); + object.hide(); } } else { $('ncdlg_errors').update(response.responseText); @@ -73,11 +72,10 @@ } }); }, - onCancel: function (event, element) { - Effect.Fade(element, { duration: 0.3 }); + onCancel: function (object, event) { + object.hide(); } }).show(); </script> - </div> </div> Modified: app/views/profile/contact.tpl =================================================================== --- app/views/profile/contact.tpl 2008-05-03 13:43:35 UTC (rev 159) +++ app/views/profile/contact.tpl 2008-05-03 14:18:47 UTC (rev 160) @@ -25,8 +25,6 @@ <div class="formcol"> <div class="middle"> <?= $form_helper->text_field('contact_profile', 'im', array('class' => 'mediumtextinput') )?> - </div> - <div class="third"> <select class="imselect"> <option>AIM</option> <option>Google talk</option> @@ -36,6 +34,9 @@ <option>Gadu-Gadu</option> <option>ICQ</option> </select> + </div> + <div class="third"> + <?= $access_field_helper->access_field('contact_profile', 'im_access', array('title' => 'Instant Messenger')); ?> </div> </div> </div> Modified: public/javascripts/dialog.js =================================================================== --- public/javascripts/dialog.js 2008-05-03 13:43:35 UTC (rev 159) +++ public/javascripts/dialog.js 2008-05-03 14:18:47 UTC (rev 160) @@ -17,23 +17,13 @@ return; } - //this.dialog = this.options.clone ? Element.extend($(element).cloneNode(true)) : $(element); this.dialog = $(element); - - Object.extend(this.dialog.style, { - position: 'absolute', - xzIndex: 9999 - }); - var offset = this.reference.viewportOffset(); - var dimensions = this.reference.getDimensions(); - var vdimensions = document.viewport.getDimensions(); + var offset = this.reference.viewportOffset(); + var dimensions = this.reference.getDimensions(); + var vdimensions = document.viewport.getDimensions(); var vscrolloffset = document.viewport.getScrollOffsets(); - - if (this.options['width']) { - var width = new String(this.options['width']); - this.dialog.style.width = width.endsWith('px') ? width : width + 'px'; - } + //alert(vdimensions.width + " : " + offset.left + " : " + dimensions.width); if (this.options['hfloat'] == 'right') { this.dialog.style.right = vdimensions.width - offset.left - dimensions.width + "px"; @@ -42,7 +32,7 @@ } if (this.options['vfloat'] == 'bottom') { - this.dialog.style.top = offset.top + dimensions.height + vscrolloffset.top + "px"; + this.dialog.style.top = vscrolloffset.top + offset.top + dimensions.height + "px"; } else { this.dialog.style.bottom = offset.top + "px"; } @@ -64,35 +54,39 @@ }, + fixIEOverlapping: function () { + Element.clonePosition(this.iefix, this.dialog); + this.iefix.style.zIndex = 1; + this.dialog.style.zIndex = 2; + this.iefix.show(); + }, + show: function (event) { + this.dialog.hide(); Element.insert(document.body, this.dialog); - if (Prototype.Browser.IE && !this.ieHack) { - var version = parseFloat(navigator.userAgent.substring(navigator.userAgent.indexOf("MSIE") + 5)); - if (version < 7.0) { - this.ieHack = new Element('iframe', { src: 'about:blank' }); - this.ieHack.setStyle({ - top: "0px", - left: "0px", - height: this.dialog.offsetHeight + "px", - width: this.dialog.offsetWidth + "px", - backgroundColor: 'red' - }); - this.dialog.insert(this.ieHack); - } + if(!this.iefix && Prototype.Browser.IE && Element.getStyle(this.dialog, 'position')=='absolute') { + new Insertion.After(this.dialog, + '<iframe id="' + this.dialog.id + '_iefix" '+ + 'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' + + 'src="javascript:false" frameborder="0" scrolling="no"></iframe>'); + this.iefix = $(this.dialog.id+'_iefix'); } - Effect.Appear(this.dialog, { duration: 0.3 }); + this.dialog.show(); + if (this.iefix) this.fixIEOverlapping(); + if (this.options.onShow) { - this.options.onShow(event, this.dialog); + this.options.onShow(this, event); } }, hide: function (event) { - - Effect.Fade(this.dialog, { duration: 0.3 }); + if(this.iefix) + this.iefix.hide(); + this.dialog.hide(); if (this.options.onHide) { - this.options.onHide(event, this.dialog); + this.options.onHide(this, event); } }, @@ -104,19 +98,19 @@ onYes: function (event) { if (this.options.hide) this.hide(); if (this.options.onYes) { - this.options.onYes(event, this.dialog); + this.options.onYes(this, event); } }, onNo: function (event) { if (this.options.hide) this.hide(); if (this.options.onNo) { - this.options.onNo(event, this.dialog); + this.options.onNo(this, event); } }, onCancel: function (event) { if (this.options.hide) this.hide(); if (this.options.onCancel) { - this.options.onCancel(event, this.dialog); + this.options.onCancel(this, event); } } }); Modified: public/stylesheets/common/Application.css =================================================================== --- public/stylesheets/common/Application.css 2008-05-03 13:43:35 UTC (rev 159) +++ public/stylesheets/common/Application.css 2008-05-03 14:18:47 UTC (rev 160) @@ -374,4 +374,5 @@ .lock.short { height: 20px; + width: 0px; } Modified: public/stylesheets/common/Form.css =================================================================== --- public/stylesheets/common/Form.css 2008-05-03 13:43:35 UTC (rev 159) +++ public/stylesheets/common/Form.css 2008-05-03 14:18:47 UTC (rev 160) @@ -10,7 +10,7 @@ .editform .formrow { clear: both; vertical-align: top; - padding: 0px 0px 3px 0px; + margin: 0px 0px 5px 0px; line-height: 16px; } @@ -68,7 +68,7 @@ } .formrow .formcol .third { - float: right; + float: left; } .formrow .formcol .tnote { Modified: public/stylesheets/common/Input.css =================================================================== --- public/stylesheets/common/Input.css 2008-05-03 13:43:35 UTC (rev 159) +++ public/stylesheets/common/Input.css 2008-05-03 14:18:47 UTC (rev 160) @@ -3,7 +3,7 @@ border: 1px solid #bdc7d8; font-family: verdana, arial, sans-serif; font-size: 11px; - margin: 0px; + margin: 0px 2px 0px 0px; } .submitinput, .buttoninput, .cancelinput { Modified: public/stylesheets/dialog.css =================================================================== --- public/stylesheets/dialog.css 2008-05-03 13:43:35 UTC (rev 159) +++ public/stylesheets/dialog.css 2008-05-03 14:18:47 UTC (rev 160) @@ -1,22 +1,8 @@ .action_dialog { position: absolute; + border: 6px solid #999999; } -/* IE6 hack start */ -.action_dialog iframe { - display:none;/*sorry for IE5*/ - display/**/:block;/*sorry for IE5*/ - position:absolute;/*must have*/ - z-index:-1;/*must have*/ - filter:mask();/*must have*/ -} - -.action_dialog #dlgborder { - background-color: #999999; - padding: 6px; -} -/* IE6 hack end */ - .action_dialog #dlgheader { background-color: #6d84b4; border: 1px solid #3b5998; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <agu...@us...> - 2008-05-03 13:43:31
|
Revision: 159 http://isocial.svn.sourceforge.net/isocial/?rev=159&view=rev Author: aguidrevitch Date: 2008-05-03 06:43:35 -0700 (Sat, 03 May 2008) Log Message: ----------- http://dev.rubyonrails.org/ticket/11182 patch applied Modified Paths: -------------- public/javascripts/prototype.js Modified: public/javascripts/prototype.js =================================================================== --- public/javascripts/prototype.js 2008-05-03 12:07:59 UTC (rev 158) +++ public/javascripts/prototype.js 2008-05-03 13:43:35 UTC (rev 159) @@ -2077,30 +2077,31 @@ }, getOffsetParent: function(element) { - if (element.offsetParent) return $(element.offsetParent); - if (element == document.body) return $(element); + element = $(element); + var op = element.offsetParent, body = document.body, docEl = document.documentElement; - while ((element = element.parentNode) && element != document.body) + /* IE with strict doctype may try to return documentElement as offsetParent + on relatively positioned elements, we will return body instead */ + if (op && op !== docEl) return $(op); + if (op === docEl || element === docEl || element === body) return $(body); + + while ((element = element.parentNode) && element !== body) if (Element.getStyle(element, 'position') != 'static') return $(element); - return $(document.body); + return $(body); }, viewportOffset: function(forElement) { - var valueT = 0, valueL = 0; + forElement = $(forElement); - var element = forElement; + var element = forElement, valueT = 0, valueL = 0; do { valueT += element.offsetTop || 0; valueL += element.offsetLeft || 0; - // Safari fix - if (element.offsetParent == document.body && - Element.getStyle(element, 'position') == 'absolute') break; + } while ((element = element.getOffsetParent()) != document.body); - } while (element = element.offsetParent); - element = forElement; do { if (!Prototype.Browser.Opera || element.tagName == 'BODY') { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <agu...@us...> - 2008-05-03 12:07:53
|
Revision: 158 http://isocial.svn.sourceforge.net/isocial/?rev=158&view=rev Author: aguidrevitch Date: 2008-05-03 05:07:59 -0700 (Sat, 03 May 2008) Log Message: ----------- access dialog width fixed Modified Paths: -------------- public/stylesheets/dialog.css Modified: public/stylesheets/dialog.css =================================================================== --- public/stylesheets/dialog.css 2008-05-03 12:06:09 UTC (rev 157) +++ public/stylesheets/dialog.css 2008-05-03 12:07:59 UTC (rev 158) @@ -55,7 +55,7 @@ } .access_dialog { - width: 240px; + width: 245px; } .access_dialog .field { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <agu...@us...> - 2008-05-03 12:06:03
|
Revision: 157 http://isocial.svn.sourceforge.net/isocial/?rev=157&view=rev Author: aguidrevitch Date: 2008-05-03 05:06:09 -0700 (Sat, 03 May 2008) Log Message: ----------- IE6 dialog fixes Modified Paths: -------------- app/views/dialog/_access.tpl app/views/dialog/_new_city.tpl public/javascripts/dialog.js public/stylesheets/dialog.css Modified: app/views/dialog/_access.tpl =================================================================== --- app/views/dialog/_access.tpl 2008-05-02 19:38:21 UTC (rev 156) +++ app/views/dialog/_access.tpl 2008-05-03 12:06:09 UTC (rev 157) @@ -1,4 +1,5 @@ <div id="access_dialog_<?= @$params['reference_element'] ?>" class="action_dialog access_dialog"> + <div id="dlgborder"> <div id="dlgheader">_{Who can see this?}</div> <div id="dlgbody"> <div class="field"><?= $text_helper->translate(@$params['title']) ?></div> @@ -29,5 +30,6 @@ } }).show(); </script> + </div> </div> Modified: app/views/dialog/_new_city.tpl =================================================================== --- app/views/dialog/_new_city.tpl 2008-05-02 19:38:21 UTC (rev 156) +++ app/views/dialog/_new_city.tpl 2008-05-03 12:06:09 UTC (rev 157) @@ -1,4 +1,5 @@ <div id="ncdlg" class="action_dialog city_dialog"> + <div id="dlgborder"> <div id="dlgheader">_{Add New City}</div> <div id="dlgbody"> <form id="city_addition_form"> @@ -78,5 +79,5 @@ }).show(); </script> - + </div> </div> Modified: public/javascripts/dialog.js =================================================================== --- public/javascripts/dialog.js 2008-05-02 19:38:21 UTC (rev 156) +++ public/javascripts/dialog.js 2008-05-03 12:06:09 UTC (rev 157) @@ -22,7 +22,7 @@ Object.extend(this.dialog.style, { position: 'absolute', - zIndex: 9999 + xzIndex: 9999 }); var offset = this.reference.viewportOffset(); @@ -66,26 +66,21 @@ show: function (event) { Element.insert(document.body, this.dialog); - if (!this.dialog.firstDescendant().hasClassName('select-free') ) { - //this.dialog.insert({top: '<iframe class="select-free" xsrc="about:blank"></iframe>'}); - this.dialog.insert('<!--[if lte IE 6.5]><iframe></iframe><![endif]-->'); + + if (Prototype.Browser.IE && !this.ieHack) { + var version = parseFloat(navigator.userAgent.substring(navigator.userAgent.indexOf("MSIE") + 5)); + if (version < 7.0) { + this.ieHack = new Element('iframe', { src: 'about:blank' }); + this.ieHack.setStyle({ + top: "0px", + left: "0px", + height: this.dialog.offsetHeight + "px", + width: this.dialog.offsetWidth + "px", + backgroundColor: 'red' + }); + this.dialog.insert(this.ieHack); + } } - - /* - if (!this.dialog.firstDescendant().hasClassName('select-free') ) { - this.dialog.insert({ top: this.ieHack }); - } - - ieHack.setStyle({ - position: 'absolute', - left: this.dialog.offsetLeft + "px", - top: this.dialog.offsetTop + "px", - height: this.dialog.offsetHeight + "px", - width: this.dialog.offsetWidth + "px", - zIndex: this.dialog.zIndex - 10, - border: '1px solid red'}); - */ - Effect.Appear(this.dialog, { duration: 0.3 }); if (this.options.onShow) { Modified: public/stylesheets/dialog.css =================================================================== --- public/stylesheets/dialog.css 2008-05-02 19:38:21 UTC (rev 156) +++ public/stylesheets/dialog.css 2008-05-03 12:06:09 UTC (rev 157) @@ -1,24 +1,22 @@ - .action_dialog { - border: 6px solid #999999; - overflow: auto; - position: relative; - background-color: white; - overflow: hidden; + position: absolute; } +/* IE6 hack start */ .action_dialog iframe { display:none;/*sorry for IE5*/ display/**/:block;/*sorry for IE5*/ position:absolute;/*must have*/ - top:0;/*must have*/ - left:0;/*must have*/ z-index:-1;/*must have*/ filter:mask();/*must have*/ - width:100%;/* must have for any big value*/ - height:100%/* must have for any big value*/; } +.action_dialog #dlgborder { + background-color: #999999; + padding: 6px; +} +/* IE6 hack end */ + .action_dialog #dlgheader { background-color: #6d84b4; border: 1px solid #3b5998; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <agu...@us...> - 2008-05-02 19:38:14
|
Revision: 156 http://isocial.svn.sourceforge.net/isocial/?rev=156&view=rev Author: aguidrevitch Date: 2008-05-02 12:38:21 -0700 (Fri, 02 May 2008) Log Message: ----------- this is supposed to fix ie6 select zindex bug, but it doesn't work for mine wine-emulated ie6 Modified Paths: -------------- public/javascripts/dialog.js public/stylesheets/common/Input.css public/stylesheets/dialog.css Modified: public/javascripts/dialog.js =================================================================== --- public/javascripts/dialog.js 2008-05-02 19:29:42 UTC (rev 155) +++ public/javascripts/dialog.js 2008-05-02 19:38:21 UTC (rev 156) @@ -66,6 +66,27 @@ show: function (event) { Element.insert(document.body, this.dialog); + if (!this.dialog.firstDescendant().hasClassName('select-free') ) { + //this.dialog.insert({top: '<iframe class="select-free" xsrc="about:blank"></iframe>'}); + this.dialog.insert('<!--[if lte IE 6.5]><iframe></iframe><![endif]-->'); + } + + /* + if (!this.dialog.firstDescendant().hasClassName('select-free') ) { + this.dialog.insert({ top: this.ieHack }); + } + + ieHack.setStyle({ + position: 'absolute', + left: this.dialog.offsetLeft + "px", + top: this.dialog.offsetTop + "px", + height: this.dialog.offsetHeight + "px", + width: this.dialog.offsetWidth + "px", + zIndex: this.dialog.zIndex - 10, + border: '1px solid red'}); + */ + + Effect.Appear(this.dialog, { duration: 0.3 }); if (this.options.onShow) { this.options.onShow(event, this.dialog); @@ -73,6 +94,7 @@ }, hide: function (event) { + Effect.Fade(this.dialog, { duration: 0.3 }); if (this.options.onHide) { this.options.onHide(event, this.dialog); Modified: public/stylesheets/common/Input.css =================================================================== --- public/stylesheets/common/Input.css 2008-05-02 19:29:42 UTC (rev 155) +++ public/stylesheets/common/Input.css 2008-05-02 19:38:21 UTC (rev 156) @@ -17,7 +17,7 @@ .cancelinput { color: black; - background-color: lightgray; + background-color: #dddddd; } .shorttextinput { Modified: public/stylesheets/dialog.css =================================================================== --- public/stylesheets/dialog.css 2008-05-02 19:29:42 UTC (rev 155) +++ public/stylesheets/dialog.css 2008-05-02 19:38:21 UTC (rev 156) @@ -1,3 +1,4 @@ + .action_dialog { border: 6px solid #999999; overflow: auto; @@ -2,8 +3,16 @@ position: relative; - z-index: 100; background-color: white; + overflow: hidden; } -.action_dialog .loading { - padding: 30px; +.action_dialog iframe { + display:none;/*sorry for IE5*/ + display/**/:block;/*sorry for IE5*/ + position:absolute;/*must have*/ + top:0;/*must have*/ + left:0;/*must have*/ + z-index:-1;/*must have*/ + filter:mask();/*must have*/ + width:100%;/* must have for any big value*/ + height:100%/* must have for any big value*/; } @@ -48,7 +57,7 @@ } .access_dialog { - width: 210px; + width: 240px; } .access_dialog .field { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <agu...@us...> - 2008-05-02 19:29:35
|
Revision: 155 http://isocial.svn.sourceforge.net/isocial/?rev=155&view=rev Author: aguidrevitch Date: 2008-05-02 12:29:42 -0700 (Fri, 02 May 2008) Log Message: ----------- my timesheet Modified Paths: -------------- timesheet/aguidrevitch.txt Modified: timesheet/aguidrevitch.txt =================================================================== --- timesheet/aguidrevitch.txt 2008-05-02 19:27:37 UTC (rev 154) +++ timesheet/aguidrevitch.txt 2008-05-02 19:29:42 UTC (rev 155) @@ -1,2 +1,3 @@ 2008-05-01,10:00,15:00,main,RT:1,"working on dialogs" 2008-05-01,16:00,22:10,main,RT:1,"working on dialogs" +2008-05-02,18:30,22:30,main,RT:1,"working on contact form, working around ie6 select bug" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |