diff options
-rw-r--r-- | views/default/object/album.php | 4 | ||||
-rw-r--r-- | views/default/object/image.php | 8 | ||||
-rw-r--r-- | views/default/tidypics/css.php | 198 | ||||
-rw-r--r-- | views/default/tidypics/forms/edit_multi.php | 6 | ||||
-rw-r--r-- | views/default/tidypics/forms/upload.php | 2 | ||||
-rw-r--r-- | views/default/tidypics/groupprofile_albums.php | 12 | ||||
-rw-r--r-- | views/default/widgets/album_view/view.php | 14 |
7 files changed, 112 insertions, 132 deletions
diff --git a/views/default/object/album.php b/views/default/object/album.php index a94f12590..63e60a339 100644 --- a/views/default/object/album.php +++ b/views/default/object/album.php @@ -21,9 +21,9 @@ //get album cover if one was set if($file->cover) - $album_cover = '<img src="'.$vars['url'].'mod/tidypics/thumbnail.php?file_guid='.$file->cover.'&size=small" border="0" class="album_cover" alt="thumbnail"/>'; + $album_cover = '<img src="'.$vars['url'].'mod/tidypics/thumbnail.php?file_guid='.$file->cover.'&size=small" border="0" class="tidypics_album_cover" alt="thumbnail"/>'; else - $album_cover = '<img src="'.$vars['url'].'mod/tidypics/graphics/img_error.jpg" class="album_cover" alt="new album">'; + $album_cover = '<img src="'.$vars['url'].'mod/tidypics/graphics/img_error.jpg" class="tidypics_album_cover" alt="new album">'; ?> <div class="album_gallery_item"> diff --git a/views/default/object/image.php b/views/default/object/image.php index 67fd87bfb..3aa9bab8e 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -19,7 +19,7 @@ if (get_input('search_viewtype') == "gallery") { ?> - <div class="album_images"> + <div class="tidypics_album_images"> <a href="<?php echo $file->getURL();?>"><img src="<?php echo $vars['url'];?>mod/tidypics/thumbnail.php?file_guid=<?php echo $file_guid;?>&size=small" border="0" alt="thumbnail"/></a> </div> <?php @@ -42,7 +42,7 @@ if (!$vars['full']) { //simple gallery view ?> - <div class="album_images"> + <div class="tidypics_album_images"> <a href="<?php echo $file->getURL();?>"><img src="<?php echo $vars['url'];?>mod/tidypics/thumbnail.php?file_guid=<?php echo $file_guid;?>&size=small" border="0" alt="thumbnail"/></a> </div> <?php @@ -79,8 +79,8 @@ <?php echo '<div id="tidypics_desc">' . autop($desc) . '</div>'; - echo '<div id="image_full">'; - echo '<div id="image_nav">' . $back . $next . '</div>'; + echo '<div id="tidypics_image_full">'; + echo '<div id="tidypics_image_nav">' . $back . $next . '</div>'; if ($next) echo '<a href="' . $vars['url'] . 'pg/photos/view/' . $_SESSION['image_sort'][$current+1] . '">'; echo '<img src="' . $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=' . $file_guid . '&size=large" border="0" alt="' . $title . '"/>'; if ($next) echo '</a>'; diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index 3c935e8c5..44590b676 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -3,145 +3,130 @@ * tidypics CSS extender */ ?> - /* --- independent view for image/album SHARED --- */ - -#tidypics_title{ - font-size:1.2em; - font-weight:bold; -} -#tidypics_desc{ - padding:0 20px; - font-style:italic; -} -#tidypics_info{ - padding:20px; - line-height:1.5em; +/* ---- tidypics object views ---- */ + +#tidypics_desc { +padding:0 20px; +font-style:italic; } -#tidypics_controls{ - text-align:center; - margin-bottom:10px; +#tidypics_info { +padding:20px; } -#tidypics_controls a{ - margin:10px; +#tidypics_controls { +text-align:center; +margin-bottom:10px; } -#group_albums_widget { --webkit-border-radius: 8px; --moz-border-radius: 8px; -background:white none repeat scroll 0 0; -margin:0 0 20px; -padding:0 0 5px; +#tidypics_controls a { +margin:10px; } .tidypics_download a { - font: 12px/100% Arial, Helvetica, sans-serif; - font-weight: bold; - color: white; - background:#4690d6; - border:none; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - width: auto; - height: 25px; - padding: 3px 6px 3px 6px; - margin:10px 0 10px 0; - cursor: pointer; +font:12px/100% Arial, Helvetica, sans-serif; +font-weight:bold; +color:white; +background:#4690d6; +border:none; +-webkit-border-radius: 5px; +-moz-border-radius: 5px; +width:auto; +height:25px; +padding:3px 6px 3px 6px; +margin:10px 0 10px 0; +cursor:pointer; } + .tidypics_download a:hover { - background: black; - color:white; - text-decoration: none; +background:black; +color:white; +text-decoration:none; } - - /* independent album view only */ - -.album_images{ - float:left; - width:160px; - height:160px; - margin:4px; - padding:5px; - border:1px solid #cccccc; - text-align:center; +.tidypics_album_images { +float:left; +width:153px; +height:153px; +margin:3px; +padding:4px; +border:1px solid #dedede; +text-align:center; } - /* independent image view only */ - -#image_full{ - text-align:center; - margin:10px; -} -#image_full img{ - padding:5px; - border:1px solid #cccccc; - margin:7px 0; +#tidypics_image_full { +text-align:center; +margin:10px; } -/* --- albums gallery view --- */ - -.album_cover{ - padding:2px; - border:1px solid #cccccc; - margin:8px 0; +#tidypics_image_full img { +padding:5px; +border:1px solid #dedede; +margin:7px 0; } +.tidypics_album_cover { +padding:2px; +border:1px solid #dedede; +margin:8px 0; +} -/* ------ album WIDGET VIEW ------ */ - -#album_widget_container{ - text-align:center; +.tidypics_album_widget_single_item { +margin-bottom:8px; } -.album_widget_single_item{ +/* ------ tidypics widget view ------ */ +#tidypics_album_widget_container { +text-align:center; } -.album_widget_title{ -} -.album_widget_timestamp { - color:#666666; - margin:0; -} -.collapsable_box #album_widget_layout { - margin:0; +.tidypics_album_widget_timestamp { +color:#333333; } /* --------- image upload/edit forms ------------ */ -#image_upload_list li{ - margin:3px 0; +#tidpics_image_upload_list li { +margin:3px 0; } -.edit_image_container{ - padding:5px; - margin:5px 0; - overflow:auto; + +.tidypics_edit_image_container { +padding:5px; +margin:5px 0; +overflow:auto; } -.edit_images{ - float:right; - width:160px; - height:160px; - margin:4px; - padding:5px; - border:1px solid #cccccc; - text-align:center; + +.tidypics_edit_images { +float:right; +width:160px; +height:160px; +margin:4px; +padding:5px; +border:1px solid #dedede; +text-align:center; } -.image_info{ - float:left; - width:60%; + +.tidypics_image_info { +float:left; +width:60%; } -.image_info label{ - font-size:1em; + +.tidypics_image_info label { +font-size:1em; } -.edit_image{ - float:right; - border:1px solid #cccccc; - width:153px; - height:153px; + +/* ---- tidypics group css ----- */ + +#group_albums_widget { +-webkit-border-radius: 8px; +-moz-border-radius: 8px; +background:white none repeat scroll 0 0; +margin:0 0 20px; +padding:0 0 5px; } + /* --------- tidypics river items ------------ */ .river_image_create { @@ -158,9 +143,4 @@ padding:0 0 5px; } .river_object_album_comment { background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; -} - -.pagination { - clear:both !important; -} -
\ No newline at end of file +}
\ No newline at end of file diff --git a/views/default/tidypics/forms/edit_multi.php b/views/default/tidypics/forms/edit_multi.php index 354600798..24755e9cf 100644 --- a/views/default/tidypics/forms/edit_multi.php +++ b/views/default/tidypics/forms/edit_multi.php @@ -19,9 +19,9 @@ $container_guid = $entity->container_guid;
if($no_cover && !$cover) $cover = $guid;
- echo '<div class="edit_image_container">';
- echo '<img src="' . $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=' . $guid . '&size=small" border="0" class="edit_images" alt="' . $title . '"/>';
- echo '<div class="image_info">';
+ echo '<div class="tidypics_edit_image_container">';
+ echo '<img src="' . $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=' . $guid . '&size=small" border="0" class="tidypics_edit_images" alt="' . $title . '"/>';
+ echo '<div class="tidypics_image_info">';
echo '<p><label>' . elgg_echo('album:title') . '</label>';
echo elgg_view("input/text", array("internalname" => "title[$key]", "value" => $title,)) . "\n";
echo '</p>';
diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php index f430fb04f..e93d3f5ba 100644 --- a/views/default/tidypics/forms/upload.php +++ b/views/default/tidypics/forms/upload.php @@ -49,7 +49,7 @@ function showhide(layer_ref) { <label><?php echo elgg_echo("images:upload"); ?></label><br /> <i><?php echo elgg_echo("tidypics:settings:maxfilesize") . ' ' . $maxfilesize; ?></i><br /> <div align="center" class="tidypics_loader" id="tidypics_loader" name="tidypics_loader" style="display:none;"><center><img alt="..." border="0" src="<?php echo $vars['url'].'mod/tidypics/graphics/loader.gif' ?>" /></center></div> - <ol id="image_upload_list"> + <ol id="tidypics_image_upload_list"> <?php for($x = 0; $x < 10; $x++){ echo '<li>' . elgg_view("input/file",array('internalname' => "upload_$x")) . "</li>\n"; diff --git a/views/default/tidypics/groupprofile_albums.php b/views/default/tidypics/groupprofile_albums.php index d975f5f99..de61b0845 100644 --- a/views/default/tidypics/groupprofile_albums.php +++ b/views/default/tidypics/groupprofile_albums.php @@ -15,19 +15,19 @@ if ($vars['entity']->photos_enable != 'no') { echo '<h2>' . elgg_echo('albums') . '</h2>';
if ($owner_albums) {
- echo '<div id="album_widget_container">';
+ echo '<div id="tidypics_album_widget_container">';
foreach($owner_albums as $album){
//get album cover if one was set
if($album->cover)
- $album_cover = '<img src="'.$vars['url'].'/mod/tidypics/thumbnail.php?file_guid='.$album->cover.'&size=small" border="0" class="album_cover" alt="album cover"/>';
+ $album_cover = '<img src="'.$vars['url'].'/mod/tidypics/thumbnail.php?file_guid='.$album->cover.'&size=small" border="0" class="tidypics_album_cover" alt="album cover"/>';
else
- $album_cover = '<img src="'.$vars['url'].'/mod/tidypics/graphics/img_error.jpg" class="album_cover" alt="new album">';
+ $album_cover = '<img src="'.$vars['url'].'/mod/tidypics/graphics/img_error.jpg" class="tidypics_album_cover" alt="new album">';
?>
- <div class="album_widget_single_item">
- <div class="album_widget_title"><a href="<?php echo $album->getURL();?>"><?php echo $album->title;?></a></div>
- <div class="album_widget_timestamp"> <?php echo elgg_echo("album:created:on") . ' ' . friendly_time($album->time_created);?></div>
+ <div class="tidypics_album_widget_single_item">
+ <div class="tidypics_album_widget_title"><a href="<?php echo $album->getURL();?>"><?php echo $album->title;?></a></div>
+ <div class="tidypics_album_widget_timestamp"> <?php echo elgg_echo("album:created:on") . ' ' . friendly_time($album->time_created);?></div>
<?php
//get the number of comments
$numcomments = elgg_count_comments($album);
diff --git a/views/default/widgets/album_view/view.php b/views/default/widgets/album_view/view.php index d56e0c3fc..b8b206b22 100644 --- a/views/default/widgets/album_view/view.php +++ b/views/default/widgets/album_view/view.php @@ -10,19 +10,19 @@ $owner_albums = get_entities("object", "album", page_owner(), "", $number, 0, false); if ($owner_albums) { - echo '<div id="album_widget_container">'; - + echo '<div id="tidypics_album_widget_container">'; + foreach($owner_albums as $album){ //get album cover if one was set if($album->cover) - $album_cover = '<img src="'.$vars['url'].'mod/tidypics/thumbnail.php?file_guid='.$album->cover.'&size=small" border="0" class="album_cover" alt="' . $album->title . '"/>'; + $album_cover = '<img src="'.$vars['url'].'mod/tidypics/thumbnail.php?file_guid='.$album->cover.'&size=small" border="0" class="tidypics_album_cover" alt="' . $album->title . '"/>'; else - $album_cover = '<img src="'.$vars['url'].'mod/tidypics/graphics/img_error.jpg" border="0" class="album_cover" alt="' . $album->title . '">'; + $album_cover = '<img src="'.$vars['url'].'mod/tidypics/graphics/img_error.jpg" border="0" class="tidypics_album_cover" alt="' . $album->title . '">'; ?> - <div class="album_widget_single_item"> - <div class="album_widget_title"><a href="<?php echo $album->getURL();?>"><?php echo $album->title;?></a></div> - <div class="album_widget_timestamp"> <?php echo elgg_echo("album:created:on") . ' '. friendly_time($album->time_created);?></div> + <div class="tidypics_album_widget_single_item"> + <div class="tidypics_album_widget_title"><a href="<?php echo $album->getURL();?>"><?php echo $album->title;?></a></div> + <div class="tidypics_album_widget_timestamp"> <?php echo elgg_echo("album:created:on") . ' '. friendly_time($album->time_created);?></div> <?php //get the number of comments $numcomments = elgg_count_comments($album); |