Download as
Browse Code »

Commit 3eb2b376a33ee7cef66051444575163c36ac1ceb

Authored by AurelioAHeckert
1 parent a18bae9e
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem463: tinyMCE conflitava com meu script de ajuda por usar uma varialvel… 

… global de nome obvio para controle. tisc tisc...

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2066 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 6 changed files with 104 additions and 96 deletions   Show diff stats
app/views/cms/_tiny_mce_article.rhtml
  Diff comments   View file @3eb2b37
... ... @@ -3,5 +3,5 @@
3 3  
4 4 <%= f.text_field('name', :size => '64') %>
5 5  
6   -<%= f.text_area('body', :cols => 64) %>
  6 +<%= f.text_area('body', :cols => 40, :style => 'width:99%') %>
7 7  
... ...
app/views/content_viewer/view_page.rhtml
  Diff comments   View file @3eb2b37
... ... @@ -7,6 +7,7 @@
7 7 if opts['addthis']
8 8 opts = opts['addthis']
9 9 %>
  10 +<div id="addThis">
10 11 <script type="text/javascript">
11 12 addthis_brand = '<%= escape_javascript( @environment.name ) %>';
12 13 <%=
... ... @@ -16,7 +17,8 @@
16 17 }
17 18 str
18 19 %></script>
19   -<a href="http://www.addthis.com/bookmark.php" class="bt_addthis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]', '<%= escape_javascript( @environment.name()+' :: '+@page.title ) %>')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><img src="/images/bt-bookmark.gif" width="53" height="16" border="0" alt="" /></a><script type="text/javascript" src="http://s7.addthis.com/js/152/addthis_widget.js"></script>
  20 +<a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]', '<%= escape_javascript( @environment.name()+' :: '+@page.title ) %>')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><img src="/images/bt-bookmark.gif" width="53" height="16" border="0" alt="" /></a><script type="text/javascript" src="http://s7.addthis.com/js/152/addthis_widget.js"></script>
  21 +</div>
20 22 <% end; end %>
21 23  
22 24 <div onmouseover="showArticleActions(true)"
... ...
public/javascripts/show-mouse-help.js
  Diff comments   View file @3eb2b37
... ... @@ -47,9 +47,9 @@ if ( window.parent == window ) {
47 47 } else {
48 48 var randTit = "iframe"+ Math.random();
49 49 window.frameHelpId = randTit;
50   - var frames = window.parent.document.getElementsByTagName("iframe");
  50 + var docFrames = window.parent.document.getElementsByTagName("iframe");
51 51 var f;
52   - for ( var i=0; f=frames[i]; i++ ) {
  52 + for ( var i=0; f=docFrames[i]; i++ ) {
53 53 if ( f.contentWindow && ( f.contentWindow.frameHelpId == randTit ) ) {
54 54 pageHelp.myFrame = f;
55 55 }
... ...
public/stylesheets/article.css
  Diff comments   View file @3eb2b37
1   -/*
2   -** Style for Article Related Elements
3   -*/
  1 +
  2 +#article {
  3 + position: relative;
  4 + text-align: justify;
  5 +}
  6 +
  7 +#article-actions {
  8 + position: absolute;
  9 + top: -25px;
  10 + right: -17px;
  11 + padding-right: 15px;
  12 +}
  13 +#article-actions.hidden {
  14 + opacity: 0.3;
  15 + filter: alpha(opacity=30);
  16 +}
  17 +
  18 +#article-tags {
  19 + font-size: 10px;
  20 + text-align: right;
  21 +}
  22 +#article-tags a {
  23 + text-decoration: none;
  24 +}
  25 +
  26 +#article-cat {
  27 + font-size: 10px;
  28 +}
  29 +
  30 +/* * * Comments * * */
  31 +
  32 +.article-comment {
  33 + position: relative;
  34 + border: 1px solid #B8CFE7;
  35 + margin-bottom: 10px;
  36 + padding: 10px;
  37 +}
  38 +
  39 +.comment-from-owner {
  40 + border: 1px solid #3465A4;
  41 + background: #B8CFE7;
  42 +}
  43 +
  44 +#content #article-comment h4 {
  45 + font-size: 14px;
  46 + margin: 0px;
  47 +}
  48 +
  49 +.comment-picture {
  50 + position: relative;
  51 + display: block;
  52 + width: 50px;
  53 + height: 50px;
  54 + background-repeat: no-repeat;
  55 + background-position: 50% 50%;
  56 + margin-right: 10px;
  57 + float: left;
  58 +}
  59 +.comment-picture span {
  60 + display: none;
  61 +}
  62 +
  63 +.comment-info {
  64 + font-size: 10px;
  65 + color: #999;
  66 +}
  67 +.comment-from-owner .comment-info {
  68 + color: #729FCF;
  69 +}
  70 +
  71 +.comment-text {
  72 + clear: left;
  73 +}
  74 +
  75 +.comment-logged-out .comment-text {
  76 + color: #888;
  77 +}
  78 +
  79 +/* * * Comment Box * * */
4 80  
5 81 .post_comment_box {
6 82 text-align: center;
... ... @@ -55,3 +131,19 @@
55 131 .post_comment_box.opened form {
56 132 display: block;
57 133 }
  134 +
  135 +/* * * addThis button * * */
  136 +
  137 +.msie #addThis {
  138 + position: relative;
  139 + margin-bottom: -5px;
  140 +}
  141 +#bt_addThis {
  142 + float: right;
  143 + margin: 0px;
  144 +}
  145 +
  146 +#addthis_dropdown15 table td {
  147 + border: none;
  148 +}
  149 +
... ...
public/stylesheets/blocks/main-block.css
  Diff comments   View file @3eb2b37
1   -
2   -#article {
3   - position: relative;
4   - text-align: justify;
5   -}
6   -
7   -#article-actions {
8   - position: absolute;
9   - top: -25px;
10   - left: 45%;
11   - padding-right: 15px;
12   -}
13   -#article-actions.hidden {
14   - opacity: 0.3;
15   - filter: alpha(opacity=30);
16   -}
17   -
18   -#article-tags {
19   - font-size: 10px;
20   - text-align: right;
21   -}
22   -#article-tags a {
23   - text-decoration: none;
24   -}
25   -
26   -#article-cat {
27   - font-size: 10px;
28   -}
29   -
30   -/* * * Comments * * */
31   -
32   -.article-comment {
33   - position: relative;
34   - border: 1px solid #B8CFE7;
35   - margin-bottom: 10px;
36   - padding: 10px;
37   -}
38   -
39   -.comment-from-owner {
40   - border: 1px solid #3465A4;
41   - background: #B8CFE7;
42   -}
43   -
44   -#content #article-comment h4 {
45   - font-size: 14px;
46   - margin: 0px;
47   -}
48   -
49   -.comment-picture {
50   - position: relative;
51   - display: block;
52   - width: 50px;
53   - height: 50px;
54   - background-repeat: no-repeat;
55   - background-position: 50% 50%;
56   - margin-right: 10px;
57   - float: left;
58   -}
59   -.comment-picture span {
60   - display: none;
61   -}
62   -
63   -.comment-info {
64   - font-size: 10px;
65   - color: #999;
66   -}
67   -.comment-from-owner .comment-info {
68   - color: #729FCF;
69   -}
70   -
71   -.comment-text {
72   - clear: left;
73   -}
74   -
75   -.comment-logged-out .comment-text {
76   - color: #888;
77   -}
78   -
  1 +/*
  2 + Use article.css for article related css
  3 +*/
... ...
public/stylesheets/common.css
  Diff comments   View file @3eb2b37
... ... @@ -267,17 +267,6 @@ div.auto-complete li.selected {
267 267 color: #204A87;
268 268 }
269 269  
270   -/* addThis button */
271   -
272   -.bt_addthis {
273   - float: right;
274   - margin: 0px;
275   -}
276   -
277   -#addthis_dropdown15 table td {
278   - border: none;
279   -}
280   -
281 270 /* pending tasks list */
282 271  
283 272 div.pending-tasks {
... ...