Changeset 222

Show
Ignore:
Timestamp:
04/27/07 18:08:30 (1 year ago)
Author:
v..@exdolo.com
Message:

- start.herb calls throw_content for it's header specific content and gets rid of it's full page of html
- restructured the html in application.herb a bit (closed up empty lines and commented div closings), called catch_content for header in the... erm, header
- ignore merb.yml in dist/conf
- move merb.yml to merb.example.yml
- merb.example.yml includes the mup.conf by default
- update the README to reflect the additional installation step
- commented out the drb call in mup.conf

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • mrblog/trunk/README

    r220 r222  
    77    http://wiki.rubyonrails.com/rails/pages/database.yml  
    88    apply, if you're unsure) 
    9 4. create a log directory at MERB_ROOT/log if one does not exist (it's omitted 
     94. copy dist/conf/merb.example.yml to dist/conf/merb.yml (you may wish to make  
     10    modifications to this file). 
     115. create a log directory at MERB_ROOT/log if one does not exist (it's omitted 
    1012   to make integration with Capistrano easier). 
    11 5. Upload the entire mrblog directory to your webserver. 
    12 6. Run rake db:schema:load from a terminal on your webserver. 
    13 7. Create a user account for yourself at http://domain.com/account/signup 
     136. Upload the entire mrblog directory to your webserver. 
     147. Run rake db:schema:load from a terminal on your webserver. 
     158. Create a user account for yourself at http://domain.com/account/signup 
    1416   (only the first user in the database may access this URL without being 
    1517    logged in).  You will be logged in automatically. 

  • mrblog/trunk/dist/app/views/files/start.herb

    r133 r222  
    1 <html> 
    2   <head> 
    3     <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> 
    4     <title>mongrel test</title> 
    5     <script src="/javascripts/prototype.js" type="text/javascript"></script> 
    6         <script src="/javascripts/effects.js" type="text/javascript"></script> 
    7         <script src="/javascripts/mup.js" type="text/javascript"></script> 
    8          
    9 <style type="text/css"> 
    10 #progress-bar { 
    11   width:500px; 
    12   height:25px; 
    13   margin:15px; 
    14   border:solid 1px #000; 
    15   position:relative; 
    16 } 
     1<% throw_content :header do %> 
     2  <style type="text/css"> 
     3  #progress-bar { 
     4    width:500px; 
     5    height:25px; 
     6    margin:15px; 
     7    border:solid 1px #000; 
     8    position:relative; 
     9  } 
    1710 
    18 #progress-bar #status-bar { 
    19   display:block; 
    20   height:25px; 
    21   width:0; 
    22   background-color:#00f; 
    23   border-right:solid 1px #000; 
    24   position:absolute; 
    25   top:0; left:0; 
    26 } 
     11  #progress-bar #status-bar { 
     12    display:block; 
     13    height:25px; 
     14    width:0; 
     15    background-color:#00f; 
     16    border-right:solid 1px #000; 
     17    position:absolute; 
     18    top:0; left:0; 
     19  } 
    2720 
    28 #progress-bar #status-text { 
    29   display:block; 
    30   padding: 0 15px; 
    31   line-height:25px; 
    32   position:absolute; 
    33   top:0; left:0; 
    34 } 
    35 </style> 
    36   </head> 
    37   <body> 
     21  #progress-bar #status-text { 
     22    display:block; 
     23    padding: 0 15px; 
     24    line-height:25px; 
     25    position:absolute; 
     26    top:0; left:0; 
     27  } 
     28  </style> 
     29  <%= js_include_tag :mup %> 
     30<% end %> 
    3831         
    3932<h2>Test file uploading.</h2> 
    …… 
    5851 
    5952<iframe id="upload" name="upload" src="about:blank"></iframe> 
    60  
    61   </body> 
    62 </html> 

  • mrblog/trunk/dist/app/views/layout/application.herb

    r133 r222  
    77        <%= css_include_tag :merb %> 
    88        <%= js_include_tag :prototype, :effects %> 
     9        <%= catch_content :header %> 
    910</head> 
    1011 
    …… 
    1617 
    1718<div id="border"> 
    18  
    19  <div id="container"> 
    20  
    21   <div id="content"> 
    22                  
    23  
    24    <div id="introduction"> 
    25       <h3>Merb Mascot</h3> 
    26       <ul> 
    27         <li><%= link_to image_tag('louiecon.gif'), "/"%> </li> 
    28       </ul> 
    29  <%= catch_content :sidebar %> 
    30    </div> 
    31  
    32 <%= catch_content :layout %> 
    33  
    34           </div> 
    35         </div> 
    36  
    37 <div id="footer">Merb: Mongrel + Erb</div> 
    38  
    39 </div> 
    40  
    41  
    42  
    43  
     19  <div id="container"> 
     20    <div id="content"> 
     21      <div id="introduction"> 
     22        <h3>Merb Mascot</h3> 
     23        <ul> 
     24          <li><%= link_to image_tag('louiecon.gif', :alt => 'Big Louie, the Merb mascot'), "/" %></li> 
     25        </ul> 
     26        <%= catch_content :sidebar %> 
     27      </div> <!-- /#introduction --> 
     28      <%= catch_content :layout %> 
     29    </div> <!-- /#content --> 
     30  </div> <!-- /#container --> 
     31  <div id="footer">Merb: Mongrel + Erb</div> 
     32</div> <!-- /#border --> 
    4433</body> 
    4534</html> 

  • mrblog/trunk/dist/conf

    • Property svn:ignore changed from
      merb_init.rb
       to
      merb_init.rb
      merb.yml

  • mrblog/trunk/dist/conf/merb.example.yml

    r153 r222  
    44:sql_session: true 
    55:environment: development 
    6 #:config: dist/conf/mup.conf 
     6:config: dist/conf/mup.conf 
    77:cache_templates: true 
     8#:start_drb: true 
    89#:drb_server_port: 32323 
    910#:cluster: 3 

  • mrblog/trunk/dist/conf/mup.conf

    r138 r222  
    11# upload progress conf 
    22---  
    3 :drb: true 
     3# :drb: true 
    44:path_info: /files/upload 
    55:frequency: 1