Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit 291d96f

Browse files
author
Charles Marion
committed
ENH: style
1 parent f863b9b commit 291d96f

24 files changed

+312
-199
lines changed

‎application/AppController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ public function preDispatch()
8383

8484
$browse=array(
8585
'view'=>$this->t('View'),
86+
'preview'=>$this->t('Preview'),
8687
'download'=>$this->t('Download'),
8788
'edit'=>$this->t('Edit'),
8889
'delete'=>$this->t('Delete'),

‎application/controllers/BrowseController.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,19 @@ public function getelementinfoAction()
162162
$item=$this->Item->load($id);
163163
$jsonContent=array_merge($jsonContent,$item->_toArray());
164164
$itemRevision=$this->Item->getLastRevision($item);
165-
$jsonContent['creation']=$itemRevision->getDate();
165+
$jsonContent['creation']=$this->Component->Date->formatDate(strtotime($itemRevision->getDate()));
166+
$jsonContent['uploaded']=$itemRevision->getUser()->_toArray();
167+
$jsonContent['revision']=$itemRevision->_toArray();
168+
$jsonContent['nbitstream']=count($itemRevision->getBitstreams());
169+
$jsonContent['type']='item';
166170
break;
167171
default:
168172
throw new Zend_Exception("Please select the right type of element.");
169173
break;
170174
}
171175
$jsonContent['translation']['Created']=$this->t('Created');
176+
$jsonContent['translation']['File']=$this->t('File');
177+
$jsonContent['translation']['Uploaded']=$this->t('Uploaded by');
172178
echo JsonComponent::encode($jsonContent);
173179
}//end getElementInfo
174180

‎application/controllers/FeedController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public function indexAction()
2424
$this->view->nCommunities=$this->Community->getCountAll();
2525
$this->view->nItems=$this->Item->getCountAll();
2626
$this->view->notifications=array();
27+
$this->view->header=$this->t('Feed');
2728
}
2829

2930
/** get getfolders Items' size */

‎application/controllers/components/DateComponent.php‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,26 @@
11
<?php
22
class DateComponent extends AppComponent
33
{
4+
// format date (ex: 01/14/2011 or 14/01/2011 (fr or en)
5+
static public function formatDate($timestamp)
6+
{
7+
if(!is_numeric($timestamp))
8+
{
9+
$timestamp=strtotime($timestamp);
10+
if($timestamp==false)
11+
{
12+
return "";
13+
}
14+
}
15+
if(Zend_Registry::get('configGlobal')->application->lang=='fr')
16+
{
17+
return date('d',$timestamp).'/'.date('m',$timestamp).'/'.date('Y',$timestamp);
18+
}
19+
else
20+
{
21+
return date('m',$timestamp).'/'.date('d',$timestamp).'/'.date('Y',$timestamp);
22+
}
23+
}
424
//format the date (ex: 5 days ago)
525
static public function ago($timestamp,$only_time=false)
626
{

‎application/layouts/layout.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
</div>
120120
<div class="HeaderAction">
121121
<ul>
122-
<li class="uploadFile">
122+
<li class="uploadFile" title="Upload" rel="<?php echo $this->webroot?>/upload/simpleupload">
123123
<a href="#"><img src="<?= $this->webroot ?>/public/images/icons/addfile.png" alt="Upload a file"/>
124124
Upload
125125
</a>

‎application/models/pdo/ItemRevisionModel.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class ItemRevisionModel extends AppModelPdo
2020
'user_id' => array('type'=>MIDAS_DATA),
2121
'bitstreams' => array('type'=>MIDAS_ONE_TO_MANY, 'model'=>'Bitstream', 'parent_column'=> 'itemrevision_id', 'child_column' => 'itemrevision_id'),
2222
'item' => array('type'=>MIDAS_MANY_TO_ONE, 'model'=>'Item', 'parent_column'=> 'item_id', 'child_column' => 'item_id'),
23+
'user' => array('type'=>MIDAS_MANY_TO_ONE, 'model'=>'User', 'parent_column'=> 'user_id', 'child_column' => 'user_id'),
2324
);
2425

2526
/** Returns the latest revision of a model */

‎application/views/community/view.phtml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $this->headScript()->appendFile($this->webroot.'/public/js/common/common.browser
66
<link type="text/css" rel="stylesheet" href="<?php echo $this->webroot?>/public/css/common/common.browser.css" />
77
<link type="text/css" rel="stylesheet" href="<?php echo $this->webroot?>/public/css/common/common.genericPage.css" />
88
<div class="viewMain">
9-
<div class="userThumbnail">
9+
<div class="genericThumbnail">
1010
<?php
1111
$thumbnail=null;
1212
if(!empty($thumbnail))
@@ -19,11 +19,11 @@ $this->headScript()->appendFile($this->webroot.'/public/js/common/common.browser
1919
}
2020
?>
2121
</div>
22-
<div class="userInfo">
23-
<div class="userName"><?php echo $this->communityDao->getName();?></div>
22+
<div class="genericInfo">
23+
<div class="genericName"><?php echo $this->communityDao->getName();?></div>
2424
</div>
2525
<img class="tabsLoading" alt="" src="<?php echo $this->webroot?>/public/images/icons/loading.gif" />
26-
<div id="tabs">
26+
<div class="tabs" id='tabsGeneric'>
2727
<ul>
2828
<li><a href="#tabs-1"><?php echo $this->t("Feed")?></a></li>
2929
<?php
@@ -83,19 +83,19 @@ $this->headScript()->appendFile($this->webroot.'/public/js/common/common.browser
8383

8484
</div>
8585
<div class="viewSideBar">
86-
<div class="sideElementFirst userAction">
86+
<div class="sideElementFirst genericAction">
8787
<h1>Actions</h1>
8888
<ul>
8989
<li>To do</li>
9090
</ul>
9191
</div>
92-
<div class="sideElement userCommunities">
92+
<div class="sideElement genericCommunities">
9393
<h1><?php echo $this->t('Members')?></h1>
9494
<ul>
9595
To Do
9696
</ul>
9797
</div>
98-
<div class="sideElementLast userStats">
98+
<div class="sideElementLast genericStats">
9999
<h1>Stats</h1>
100100
Todo
101101
</div>

‎application/views/upload/simpleupload.phtml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,13 @@
2020
<script type="text/javascript" src="<?php echo $this->webroot?>/public/js/jquery/jquery.form.js"></script>
2121
<script type="text/javascript" src="<?php echo $this->webroot?>/public/js/upload/upload.simpleupload.js"></script>
2222

23-
<div id="tabs">
23+
<div class="tabs" id='uploadTabs'>
2424
<ul>
25-
<li><a href="#tabs-1">Simple</a></li>
25+
<li><a href="#uploadTabs-1">Simple</a></li>
2626
<li><a href="<?php echo $this->webroot?>/upload/javaupload"><?php echo $this->t('Large Files');?></a></li>
27-
<li><a href="#tabs-3"><?php echo $this->t('Links');?></a></li>
27+
<li><a href="#uploadTabs-3"><?php echo $this->t('Links');?></a></li>
2828
</ul>
29-
<div id="tabs-1">
30-
29+
<div id="uploadTabs-1">
3130
<form id="form1" action="index.php" method="post" enctype="multipart/form-data">
3231
<span id="spanButtonPlaceHolder"></span>
3332
<div>
@@ -41,8 +40,7 @@
4140
<input id="btnCancel" style="display:none;" type="button" value="Cancel All Uploads" onclick="swfu.cancelQueue();" disabled="disabled" style="margin-left: 2px; font-size: 8pt; height: 29px;" />
4241
</form>
4342
</div>
44-
<div id="tabs-3">
45-
43+
<div id="uploadTabs-3">
4644
<form id="linkForm" class="genericForm" method="<?php echo $this->form['method']?>" action="<?php echo $this->form['action']?>">
4745
<div >
4846
<?php echo $this->form['url']?>

‎application/views/user/userpage.phtml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $this->headScript()->appendFile($this->webroot.'/public/js/common/common.browser
66
<link type="text/css" rel="stylesheet" href="<?php echo $this->webroot?>/public/css/common/common.browser.css" />
77
<link type="text/css" rel="stylesheet" href="<?php echo $this->webroot?>/public/css/common/common.genericPage.css" />
88
<div class="viewMain">
9-
<div class="userThumbnail">
9+
<div class="genericThumbnail">
1010
<?php
1111
$thumbnail=$this->user->getThumbnail();
1212
if(!empty($thumbnail))
@@ -19,12 +19,12 @@ $this->headScript()->appendFile($this->webroot.'/public/js/common/common.browser
1919
}
2020
?>
2121
</div>
22-
<div class="userInfo">
23-
<div class="userName"><?php echo $this->user->getFullName();?></div>
24-
<div class="userCompany"><?php echo $this->user->getCompany();?></div>
22+
<div class="genericInfo">
23+
<div class="genericName"><?php echo $this->user->getFullName();?></div>
24+
<div class="genericCompany"><?php echo $this->user->getCompany();?></div>
2525
</div>
2626
<img class="tabsLoading" alt="" src="<?php echo $this->webroot?>/public/images/icons/loading.gif" />
27-
<div id="tabs">
27+
<div class="tabs" id='tabsGeneric'>
2828
<ul>
2929
<li><a href="#tabs-1"><?php echo $this->t("Feed")?></a></li>
3030
<?php
@@ -84,13 +84,13 @@ $this->headScript()->appendFile($this->webroot.'/public/js/common/common.browser
8484

8585
</div>
8686
<div class="viewSideBar">
87-
<div class="sideElementFirst userAction">
87+
<div class="sideElementFirst genericAction">
8888
<h1>Actions</h1>
8989
<ul>
9090
<li>To do</li>
9191
</ul>
9292
</div>
93-
<div class="sideElement userCommunities">
93+
<div class="sideElement genericCommunities">
9494
<h1>Communities</h1>
9595
<ul>
9696
<?php
@@ -101,7 +101,7 @@ $this->headScript()->appendFile($this->webroot.'/public/js/common/common.browser
101101
?>
102102
</ul>
103103
</div>
104-
<div class="sideElementLast userStats">
104+
<div class="sideElementLast genericStats">
105105
<h1>Stats</h1>
106106
Todo
107107
</div>

‎public/css/common/common.browser.css‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,17 @@ ul.pathBrowser li{
2626
padding: 3px 22px 7px 10px;
2727
text-shadow: 0px 1px 0px #EEE;
2828
background-image: url("../../images/icons/path-divider.png");
29+
}
30+
31+
32+
33+
ul.pathBrowser li a{
34+
font-size: 14px;
35+
text-shadow: white 0px 1px 1px;
36+
color: #333BA0;
37+
font-weight: bold;
38+
}
39+
40+
span.infoTitle{
41+
font-weight: bold;
2942
}

0 commit comments

Comments
 (0)