You are viewing a plain text version of this content. The canonical link for it is here.
Posted to photark-commits@incubator.apache.org by bh...@apache.org on 2012/08/16 18:57:51 UTC
svn commit: r1373979 - in /incubator/photark/mobile/trunk/assets/www:
index.html scripts/facebook.js scripts/flickr.js scripts/picasa.js
Author: bhargav
Date: Thu Aug 16 18:57:50 2012
New Revision: 1373979
URL: http://svn.apache.org/viewvc?rev=1373979&view=rev
Log:
Modified the arrangement of images that get displayed.
Modified:
incubator/photark/mobile/trunk/assets/www/index.html
incubator/photark/mobile/trunk/assets/www/scripts/facebook.js
incubator/photark/mobile/trunk/assets/www/scripts/flickr.js
incubator/photark/mobile/trunk/assets/www/scripts/picasa.js
Modified: incubator/photark/mobile/trunk/assets/www/index.html
URL: http://svn.apache.org/viewvc/incubator/photark/mobile/trunk/assets/www/index.html?rev=1373979&r1=1373978&r2=1373979&view=diff
==============================================================================
--- incubator/photark/mobile/trunk/assets/www/index.html (original)
+++ incubator/photark/mobile/trunk/assets/www/index.html Thu Aug 16 18:57:50 2012
@@ -18,6 +18,16 @@
{
text-align:right;
}
+ .cell
+ {
+ float: left;
+ width: 150px;
+ height:150px;
+ }
+ .image
+ {
+ margin:auto;
+ }
</style>
<script type="text/javascript" src="scripts/jquery-1.7.2.min.js"></script>
<script type="text/javascript" src="scripts/jquery.mobile-1.1.0.min.js"></script>
Modified: incubator/photark/mobile/trunk/assets/www/scripts/facebook.js
URL: http://svn.apache.org/viewvc/incubator/photark/mobile/trunk/assets/www/scripts/facebook.js?rev=1373979&r1=1373978&r2=1373979&view=diff
==============================================================================
--- incubator/photark/mobile/trunk/assets/www/scripts/facebook.js (original)
+++ incubator/photark/mobile/trunk/assets/www/scripts/facebook.js Thu Aug 16 18:57:50 2012
@@ -51,17 +51,18 @@ function me() {
var d = document.createElement('div');
if(item.name===undefined)
{
- d.innerHTML = "<img src="+item.picture+"/><br />"+"No caption";
+ d.innerHTML = "<div class='cell'><a href="+"#"+"><img class='image' src="+item.picture+"/></a><br />"+"No caption"+"</div>";
}
else
{
- d.innerHTML = "<img src="+item.picture+"/><br />"+item.name;
+ d.innerHTML = "<div class='cell'><a href="+"#"+"><img class='image' src="+item.picture+"/></a><br />"+item.name.substr(0,20)+"..."+"</div>";
}
data.appendChild(d);
});
}
count=count+8;
- $('#facebook').append($('<a id="facebookMore" class="more" data-role="button" data-icon="forward" onclick="me()" />').text('More..'));
+ //$('#facebook').append($('<a data-role="button" data-inline="true" data-direction="reverse" data-transition="fade" data-theme="a" href="#page1" data-icon="arrow-d" data-iconpos="right" id="facebookMore" class="more" data-role="button" data-icon="forward" onclick="me()" />').text('More..'));
+ $('#facebook').append('<a data-role="button" data-inline="true" data-theme="a" data-icon="arrow-d" data-iconpos="right" id="facebookMore" class="more" onclick="me()">More...</a>');
});
}
function login() {
Modified: incubator/photark/mobile/trunk/assets/www/scripts/flickr.js
URL: http://svn.apache.org/viewvc/incubator/photark/mobile/trunk/assets/www/scripts/flickr.js?rev=1373979&r1=1373978&r2=1373979&view=diff
==============================================================================
--- incubator/photark/mobile/trunk/assets/www/scripts/flickr.js (original)
+++ incubator/photark/mobile/trunk/assets/www/scripts/flickr.js Thu Aug 16 18:57:50 2012
@@ -50,18 +50,18 @@ function get_userphotos(oauth_token,oaut
data.photos.photo.forEach(function(item){
if(item.title===undefined)
{
- $('#flickr').append('<img src="http://farm'+item.farm+'.staticflickr.com/'+item.server+'/'+item.id+'_'+item.secret+'_t.jpg" /><br />No Caption<br />');
+ ('#flickr').append('<div class="cell"><a href='+"#"+'><img class="image" src="http://farm'+item.farm+'.staticflickr.com/'+item.server+'/'+item.id+'_'+item.secret+'_t.jpg" /></a><br />No Caption<br /></div>');
}
else
{
- $('#flickr').append('<img src="http://farm'+item.farm+'.staticflickr.com/'+item.server+'/'+item.id+'_'+item.secret+'_t.jpg" /><br />'+item.title+'<br />');
+ $('#flickr').append('<div class="cell"><a href='+"#"+'><img class="image" src="http://farm'+item.farm+'.staticflickr.com/'+item.server+'/'+item.id+'_'+item.secret+'_t.jpg" /></a><br />'+item.title.substr(0,20)+"..."+'<br /></div>');
}
});
console.log(page);
console.log(photos_page_max);
if(photos_page_max!=page)
{
- $('#flickr').append($('<a id="flickrMore" class="more" data-role="button" data-icon="forward" onclick="get_userphotos(oauth_token,oauth_token_secret)" />').text('More..'));
+ $('#flickr').append($('<a data-role="button" data-inline="true" data-theme="a" data-icon="arrow-d" data-iconpos="right" id="flickrMore" class="more" onclick="get_userphotos(oauth_token,oauth_token_secret)" />').text('More..'));
}
},
error: function( error ){
Modified: incubator/photark/mobile/trunk/assets/www/scripts/picasa.js
URL: http://svn.apache.org/viewvc/incubator/photark/mobile/trunk/assets/www/scripts/picasa.js?rev=1373979&r1=1373978&r2=1373979&view=diff
==============================================================================
--- incubator/photark/mobile/trunk/assets/www/scripts/picasa.js (original)
+++ incubator/photark/mobile/trunk/assets/www/scripts/picasa.js Thu Aug 16 18:57:50 2012
@@ -23,18 +23,18 @@ function listing_photos(access_token,ref
{
if($(this).find('summary').text()==='')
{
- $('#picasa').append('<img src="'+$(this).find('thumbnail').attr('url')+'" /><br />No Caption<br />');
+ $('#picasa').append('<div class="cell"><a href='+"#"+'><img class="image" src="'+$(this).find('thumbnail').attr('url')+'" /></a><br />No Caption<br /></div>');
}
else
{
console.log($(this).find('thumbnail').attr('url')+'----'+$(this).find('summary').text());
- $('#picasa').append('<img src="'+$(this).find('thumbnail').attr('url')+'" /><br />'+$(this).find('summary').text()+'<br />');
+ $('#picasa').append('<div class="cell"><a href='+"#"+'><img class="image" src="'+$(this).find('thumbnail').attr('url')+'" /><br />'+$(this).find('summary').text().substr(0,20)+"..."+'<br /></div>');
}
});
if($(data).find('link').attr('rel')!=undefined)
{
console.log($(data).find('link').attr('rel'));
- $('#picasa').append($('<a id="picasaMore" class="more" data-role="button" data-icon="forward" onclick="listing_photos(access_token,refresh_token);" />').text('More..'));
+ $('#picasa').append($('<a data-role="button" data-inline="true" data-theme="a" data-icon="arrow-d" data-iconpos="right" id="picasaMore" class="more" onclick="listing_photos(access_token,refresh_token);" />').text('More..'));
}
},
error: function( error ){