Changeset 29
- Timestamp:
- 07/13/07 20:42:19 (18 months ago)
- Location:
- trunk/app
- Files:
-
- 43 added
- 7 modified
-
controllers/news_controller.php (modified) (1 diff)
-
controllers/pollrows_controller.php (modified) (1 diff)
-
views/elements/lastentries.thtml (modified) (1 diff)
-
views/news/admin_add.thtml (modified) (2 diffs)
-
views/news/admin_edit.thtml (modified) (2 diffs)
-
views/news/view.thtml (modified) (5 diffs)
-
webroot/img/static/3d-feed-icon.jpg (added)
-
webroot/img/static/ball-green.gif (added)
-
webroot/img/static/beta.gif (added)
-
webroot/img/static/blog-bg-default.jpg (added)
-
webroot/img/static/blog_forums.gif (added)
-
webroot/img/static/blogactiv.gif (added)
-
webroot/img/static/board.gif (added)
-
webroot/img/static/border1.gif (added)
-
webroot/img/static/button_download.gif (added)
-
webroot/img/static/cakephp-80x15.png (added)
-
webroot/img/static/comment.gif (added)
-
webroot/img/static/css-80x15.png (added)
-
webroot/img/static/debian-80x15.gif (added)
-
webroot/img/static/favicon.ico (modified) (previous)
-
webroot/img/static/firefox-80x15.png (added)
-
webroot/img/static/folder.gif (added)
-
webroot/img/static/folder_big.gif (added)
-
webroot/img/static/forum.gif (added)
-
webroot/img/static/free-blog.gif (added)
-
webroot/img/static/grey-gradient.jpg (added)
-
webroot/img/static/hacker-80x15.png (added)
-
webroot/img/static/help-icon.png (added)
-
webroot/img/static/helpIcon.gif (added)
-
webroot/img/static/icon_add.gif (added)
-
webroot/img/static/icon_chat.gif (added)
-
webroot/img/static/lchat.png (added)
-
webroot/img/static/locked.gif (added)
-
webroot/img/static/main_nav_bg.jpg (added)
-
webroot/img/static/menu_a_hover.gif (added)
-
webroot/img/static/mn-small-banner.png (added)
-
webroot/img/static/mn-small.png (added)
-
webroot/img/static/mn_downloads.jpg (added)
-
webroot/img/static/new.gif (added)
-
webroot/img/static/new_post.gif (added)
-
webroot/img/static/ooorg-80.png (added)
-
webroot/img/static/pgsql-80x15.png (added)
-
webroot/img/static/post_reply.gif (added)
-
webroot/img/static/print-icon.gif (added)
-
webroot/img/static/qehac.gif (added)
-
webroot/img/static/qn.jpg (added)
-
webroot/img/static/qstuve.png (added)
-
webroot/img/static/registernow.jpg (added)
-
webroot/img/static/top.png (added)
-
webroot/img/static/url-moving.gif (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk/app/controllers/news_controller.php
r25 r29 137 137 $this->data["News"]["user_id"] = $this->othAuth->user('id'); 138 138 139 if ($this->News->save($this->data["News"]))139 if ($this->News->save($this->data["News"])) 140 140 { 141 141 if ( $this->data["News"]["end"] == 1 ) 142 142 { 143 $this->redirect('/admin/news/listing');143 $this->redirect('/admin/news/listing'); 144 144 } 145 145 else 146 146 { 147 $id = $this->News->getLastInsertID();148 $this->msgFlash('Your story has been added!','/admin/news/edit/'.$id);149 exit();147 $id = $this->News->getLastInsertID(); 148 $this->msgFlash('Your story has been added!','/admin/news/edit/'.$id); 149 exit(); 150 150 } 151 151 } -
trunk/app/controllers/pollrows_controller.php
r15 r29 15 15 } 16 16 17 public function vote() 18 { 19 // adds new vote to database 20 if (!empty($this->data["Pollrow"])) 21 { 22 $vote = $this->Pollrow->field('Pollrow.vote', array("Pollrow.id" => $this->data['Pollrow']['id']) ); 23 24 $vote += 1; 25 26 $this->data['Pollrow']['vote'] = $vote; // add vote 27 28 if ( $this->Pollrow->save($this->data) ) // add the Poll vote 29 { 30 $_SESSION["poll"] = true; //set session, only one vote per session 31 32 $conditions = array("Pollrow.poll_id" => $this->data['Pollrow']['poll_id']); 33 $fields = array("Pollrow.answer", "Pollrow.color", "Pollrow.vote", "Pollrow.poll_id"); 34 $order = "Pollrow.answer DESC"; 35 36 $this->set('poll', $this->Pollrow->findAll($conditions, $fields, $order, null, null, 2)); 37 38 $this->render('results', 'ajax'); 39 } 40 } 41 } 17 public function vote() 18 { 19 // adds new vote to database 20 if (!empty($this->data)) 21 { 22 //die(print_r($this->data)); 23 24 $vote = $this->Pollrow->field('vote', array("id" => $this->data['Pollrow']['id'])); 25 26 $vote += 1; 27 //exit("votos " . $vote); 28 $this->data['Pollrow']['vote'] = $vote; // add vote 29 30 if ( $this->Pollrow->save( $this->data['Pollrow'] ) ) // add the Poll vote 31 { 32 $this->Session->write('poll', $this->data['Pollrow']['poll_id']); //set session, only one vote per session 33 34 $conditions = array("Pollrow.poll_id" => $this->data['Pollrow']['poll_id']); 35 $fields = array("Pollrow.answer", "Pollrow.color", "Pollrow.vote", "Pollrow.poll_id", "Poll.id", "Poll.question"); 36 $order = "Pollrow.id"; 37 38 $this->set('poll', $this->Pollrow->findAll($conditions, $fields, $order)); 39 40 $this->render('results', 'ajax'); 41 } 42 else 43 { 44 echo "Ajax error, check with the company's computer guy..."; 45 } 46 } 47 } 42 48 43 49 public function add() -
trunk/app/views/elements/lastentries.thtml
r23 r29 1 1 <?php 2 2 3 echo $html->image('static/blogactiv.gif', array("alt"=>" Bloggers Activos", "title"=>"Bloggers Activos", "style"=>"margin-right:5px 0 10px 0"));3 echo $html->image('static/blogactiv.gif', array("alt"=>"Teachers Blogging", "title"=>"Teachers Blogging", "style"=>"margin-right:5px 0 10px 0")); 4 4 echo "<br />"; 5 5 -
trunk/app/views/news/admin_add.thtml
r25 r29 19 19 <td> 20 20 <?php 21 echo $form->labelTag( 'News/ subject_id', 'Category' );22 echo $html->selectTag('News/ subject_id', $subjects, null, null, null, false, false);21 echo $form->labelTag( 'News/theme_id', 'Theme:' ); 22 echo $html->selectTag('News/theme_id', $themes, null, null, null, false, false); 23 23 ?> 24 24 </td> … … 38 38 <?php echo $html->tagErrorMsg('News/body', 'Body is required.'); ?> 39 39 </td></tr> 40 <tr><td colspan=" 4"><?php40 <tr><td colspan="2"><?php 41 41 echo $form->labelTag( 'News/status', 'Published:' ); 42 42 echo $html->checkbox('News/status', null, array("value"=>1)); 43 43 ?> 44 </td></tr> 44 </td> 45 <td colspan="2"> 46 <?php 47 echo $form->labelTag( 'News/end', 'Finish editing:' ); 48 echo $html->checkbox('News/end', null, array("value"=>1)); 49 ?> 50 </td> 51 </tr> 45 52 46 53 <tr><td colspan="4"> <?php echo $html->submit('Add'); ?> </form></td></tr> -
trunk/app/views/news/admin_edit.thtml
r20 r29 1 <?php echo $javascript->link('prototype'); ?> 2 <?php echo $javascript->link('myfunctions'); ?> 3 <?php echo $javascript->link('poll'); ?> 4 <?php echo $javascript->link('fckeditor/fckeditor'); ?> 1 2 <?php echo $javascript->link('fckeditor/fckeditor'); ?> 3 4 <script type="text/javascript"> 5 window.onload = timedMsg; 6 </script> 7 <?php $session->flash(); ?> 5 8 6 9 <?php echo $html->addCrumb('Control Tools', '/admin/entries/index'); ?> … … 22 25 <td> 23 26 <?php 24 echo $form->labelTag( 'News/ subject_id', 'Category' );25 echo $html->selectTag('News/ subject_id', $subjects, null, null, null, false, false);27 echo $form->labelTag( 'News/theme_id', 'Theme:' ); 28 echo $html->selectTag('News/theme_id', $themes, null, null, null, false, false); 26 29 ?> 27 30 </td> -
trunk/app/views/news/view.thtml
r22 r29 8 8 <div class="titnew"><?php echo $val['News']['title']; ?></div> 9 9 <div class="redaccion"> 10 Desde la redacción de <i><?php echo $val['Theme']['theme']; ?></i>,10 <i>From the <?php echo $val['Theme']['theme']; ?> department</i>, 11 11 <a style="font-size:7pt;" href="/users/blogger/<?php echo $val['User']['username']; ?>"><?php echo $val['User']['username']; ?></a> informa. 12 12 <?php echo $val['News']['created']; ?> … … 22 22 </div> 23 23 24 <?php 25 echo $news->newVote($val['News']['id'], $val['News']['votes']); 24 <?php 26 25 echo $val['News']['body']; 27 26 ?> … … 35 34 36 35 <?php echo $html->link( 37 $html->image(' /admin/newwindow.gif', array("alt"=>"Abre Ventana", "title"=>"Abre Ventana")),36 $html->image('admin/newwindow.gif', array("alt"=>"Open Window", "title"=>"Open Window")), 38 37 $val['News']['reference'], 39 38 array("onclick"=>"window.open(this.href, '_help', 'status,scrollbars,resizable,width=800,height=600,left=10,top=10,menubar,toolbar')"), … … 46 45 { 47 46 $num_coment = count($val["Comentnew"]); 47 48 48 if ( $num_coment > 0 ) 49 49 { 50 echo " ". $html->link($num_coment . ' Com entarios', '/news/display/'.$val['News']['id'], array("style"=>"font-size:7pt"));50 echo " ". $html->link($num_coment . ' Comments', '/news/display/'.$val['News']['id'], array("style"=>"font-size:7pt")); 51 51 } 52 52 echo $html->link('Pon tu comentario', '/news/display/'.$val['News']['id'], array("style"=>"font-size:7pt;padding-left:20px")) . "<br />"; … … 57 57 echo "</div><br />"; 58 58 59 } 59 } 60 60 61 61 print $pagination;
