diff --git a/application/controllers/ItemController.php b/application/controllers/ItemController.php index 028718a4c..c04a2876f 100644 --- a/application/controllers/ItemController.php +++ b/application/controllers/ItemController.php @@ -4,7 +4,7 @@ class ItemController extends AppController { public $_models=array('Item'); public $_daos=array(); - public $_components=array(); + public $_components=array('Date'); public $_forms=array(); /** Init Controller */ @@ -24,6 +24,7 @@ function viewAction() { //TODO: add policy check $this->view->header=$this->t("Item"); + $this->view->Date=$this->Component->Date; $itemId=$this->_getParam("itemId"); if(!isset($itemId)||!is_numeric($itemId)) { @@ -60,6 +61,10 @@ function viewAction() $recentItems[]=$itemDao; setcookie("recentItems", serialize($recentItems), time()+60*60*24*30,'/'); //30 days + $itemRevision=$this->Item->getLastRevision($itemDao); + $itemDao->lastrevision=$itemRevision; + $itemDao->revisions=$itemDao->getRevisions(); + $itemDao->creation=$this->Component->Date->formatDate(strtotime($itemRevision->getDate())); $this->view->itemDao=$itemDao; }//end index diff --git a/application/views/item/view.phtml b/application/views/item/view.phtml index dd949dab1..0f8bc0668 100644 --- a/application/views/item/view.phtml +++ b/application/views/item/view.phtml @@ -1,9 +1,41 @@ + + +
-itemDao->getName(); +
+ webroot}/public/images/icons/document-big.png' alt=''/>"; ?> - +
+
+
itemDao->getName(); ?>
+
+ + + + + + + + + + + + itemDao->revisions as $revision) + { + echo ""; + echo " "; + echo " "; + echo " "; + echo ""; + $node++; + } + ?> + +
t('Revision');?>t('Uploaded');?>t('Changes');?>
Revision {$revision->getRevision()}{$this->Date->ago($revision->getDate(),false)} {$this->t('by')} {$revision->getUser()->getFullName()}{$revision->getChanges()}
@@ -11,15 +43,46 @@

Info

- bla + + + + + + + + + + + + + + + + + + + +
t('Created')?>itemDao->creation?>
t('Uploaded by');?>itemDao->lastrevision->getUser()->getFullName()?>
RevisionitemDao->lastrevision->getRevision()?>
t('File');?>itemDao->lastrevision->getBitstreams())?>
+ itemDao->getThumbnail(); + if(!empty($path)&& file_exists(BASE_PATH.'/'.$path)) + { + echo " +

{$this->t('Preview')}

+ + "; + } + ?>
diff --git a/public/css/item/item.view.css b/public/css/item/item.view.css new file mode 100644 index 000000000..735211e20 --- /dev/null +++ b/public/css/item/item.view.css @@ -0,0 +1,12 @@ + +div.viewAction{ + display:block!important; +} + +div.viewInfo{ + display:block!important; +} + +table#browseTable{ + display: table!important; +} \ No newline at end of file diff --git a/public/js/common/common.browser.js b/public/js/common/common.browser.js index 6a20388f0..6808980c0 100644 --- a/public/js/common/common.browser.js +++ b/public/js/common/common.browser.js @@ -205,7 +205,7 @@ if(arrayElement['thumbnail']!=undefined&&arrayElement['thumbnail']!='') { - html+='

'+json.browse.preview+'

'; + html+='

'+json.browse.preview+'

'; } $('div.ajaxInfoElement').html(html); diff --git a/translation/fr-main.csv b/translation/fr-main.csv index 4c338db11..9dfb35cbc 100644 --- a/translation/fr-main.csv +++ b/translation/fr-main.csv @@ -45,7 +45,7 @@ Private;Priv Public;Publique Semi-private;Semi-privée Description;Description -Created:Créée; +Created;Crée View;Voir Edit;Editer Delete;Effacer @@ -100,4 +100,7 @@ Selected;S element;élement No communty available;Pas de communauté disponible Create your own community;Créez la votre -This folder is empty;Ce répertoire est vide \ No newline at end of file +This folder is empty;Ce répertoire est vide +by;par +Uploaded;Uploadé +Changes;Changements \ No newline at end of file