Skip to content
This repository has been archived by the owner on Jan 20, 2024. It is now read-only.

Commit

Permalink
Fixed cancel button
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelchisari
michaelchisari authored and The Appleseed Project committed Nov 27, 2010
1 parent 229c177 commit 8c36a16
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
6 changes: 3 additions & 3 deletions components/journal/controllers/entry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,10 @@ public function Cancel ( ) {
$this->_Focus = $this->Talk ( 'User', 'Focus' );
$this->_Current = $this->Talk ( 'User', 'Current' );

$Entry = $this->GetSys ( 'Request' )->Get ( 'Entry' );
$Identifier = $this->GetSys ( 'Request' )->Get ( 'Identifier' );

if ( $Entry ) {
$location = '/profile/' . $this->_Focus->Username . '/journal/' . $Entry;
if ( $Identifier ) {
$location = '/profile/' . $this->_Focus->Username . '/journal/' . $Identifier;
} else {
$location = '/profile/' . $this->_Focus->Username . '/journal/';
}
Expand Down
14 changes: 12 additions & 2 deletions themes/default/style/theme.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@
#profile-journal-edit input[type="text"] { width:496px; }
#profile-journal-edit textarea { width:496px; height:150px; }
#profile-journal-edit .privacy label { width:auto; }
#profile-journal-edit .preview { font-size:100%; width:590px; margin-left:50px; border:1px solid #c0d895; padding:5px; }
#profile-journal-edit .preview { float:left; clear:both; font-size:100%; width:590px; margin-left:50px; border:1px solid #c0d895; padding:5px; }
#profile-journal-edit img { max-width:590px; }
#profile-journal-edit .remove { float:right; clear:both; margin-top:5px; }
#profile-journal-edit fieldset { clear:both; }
Expand All @@ -476,11 +476,21 @@


/* Journal Entry */
#profile-journal-entry .body img { max-width:700px; }
#profile-journal-entry .body { float:left; clear:both; font-size:100%; width:590px; margin-top:10px; margin-left:50px; border:1px solid #c0d895; padding:5px; }
#profile-journal-entry .body img { max-width:590px; }
#profile-journal-entry .body a { margin:0; padding:0; background:none; }

#profile-journal-edit .preview h1, #profile-journal-entry .body h1 { color:#2a2a2a; font-size:160%; border:none; clear:both; float:left; margin-bottom:5px; }
#profile-journal-edit .preview h2, #profile-journal-entry .body h2 { color:#2a2a2a; font-size:150%; border:none; clear:both; float:left; margin-bottom:5px; }
#profile-journal-edit .preview h3, #profile-journal-entry .body h3 { color:#2a2a2a; font-size:140%; border:none; clear:both; float:left; margin-bottom:5px; }
#profile-journal-edit .preview h4, #profile-journal-entry .body h4 { color:#2a2a2a; font-size:130%; border:none; clear:both; float:left; margin-bottom:5px; }
#profile-journal-edit .preview h5, #profile-journal-entry .body h5 { color:#2a2a2a; font-size:120%; border:none; clear:both; float:left; margin-bottom:5px; }
#profile-journal-edit .preview h6, #profile-journal-entry .body h6 { color:#2a2a2a; font-size:110%; border:none; clear:both; float:left; margin-bottom:5px; }

#profile-journal-entry .permalink { margin-top:5px; color:#8a8a8a; font-style:italic; }
#profile-journal-entry .permalink a { color:#8a8a8a; background:none; padding:0; }
#profile-journal-entry .edit { font-size:80%; float:right; padding:1px 5px; -moz-border-radius:5px; -webkit-border-radius:5px; -moz-box-shadow:0px 0px 2px rgba(0,0,0,0.4); -webkit-box-shadow:0px 0px 2px rgba(0,0,0,0.4); color:rgba(0,0,0,0.9); text-shadow:1px 1px 0px rgba(255,255,255,0.8); border:1px solid rgba(0,0,0,0.5); background:-webkit-gradient(linear,0% 0%,0% 100%,from(rgba(255,255,255,1)),to(rgba(185,185,185,1))); background:-moz-linear-gradient(top,rgba(255,255,255,1),rgba(185,185,185,1)); }
#profile-journal-edit form .journal-markup-info { margin:10px 10px 10px 128px; padding:10px; }

/* Journal Entries */

Expand Down

0 comments on commit 8c36a16

Please sign in to comment.