Changeset 980


Ignore:
Timestamp:
01/24/10 10:03:55 (3 years ago)
Author:
nick_ramsay
Message:

[Branch] Bars theme, plus tweaks to default templates (extra css ids/class names), and removed unnecessary table from submit step 1.

Location:
branches/1.0/content
Files:
74 added
10 edited

Legend:

Unmodified
Added
Removed

  • branches/1.0/content/plugins/submit/css/submit.css

    r847 r980  
    33 ************************************** */ 
    44 
     5#submit_1, #submit_2, #submit_3, #submit_edit { margin-top: 1.0em; } 
     6 
     7/* step 1 */ 
     8#submit_orig_url { width: 30em; } 
     9#submit_button_1 { float: right; } 
     10#submit_no_link { margin-top: 0.4em; } 
     11 
     12/* step 2 */ 
     13#post_title, #post_content, #post_tags { width: 36em; } 
     14 
     15/* step 3 */ 
    516#submit_edit_confirm { width: 100%; text-align: center; } 
    617#submit_edit_confirm input { width: 10.0em; } 
     18 
     19/* edit */ 
     20#post_orig_url { width: 36em; } /* source url for admins only */ 

  • branches/1.0/content/plugins/submit/templates/submit1.php

    r899 r980  
    2727$submitted_url = urldecode($h->vars['submitted_data']['submit_orig_url']); 
    2828?> 
     29<div id="submit_1"> 
    2930 
    3031    <?php echo $h->showMessage(); ?> 
    … …  
    3435     
    3536    <form name='submit_1' action='<?php echo BASEURL; ?>index.php?page=submit1' method='post'> 
    36     <table> 
    37     <tr> 
    38         <td><?php echo $h->lang["submit_url"]; ?>&nbsp; </td> 
    39         <td><input type='text' id='submit_orig_url' name='submit_orig_url' value='<?php echo $submitted_url; ?>' /></td> 
    40         <td>&nbsp;</td> 
    41     </tr> 
    42     <?php if ($h->currentUser->getPermission('can_post_without_link') == 'yes') { ?> 
    43     <tr> 
    44         <td colspan = 3><input type='checkbox' name='no_link'>&nbsp; 
    45             <?php echo $h->lang["submit_post_without_link"]; ?></td> 
    46     </tr> 
    47     <?php } ?> 
     37        <?php echo $h->lang["submit_url"]; ?>&nbsp;  
     38        <input id='submit_orig_url'type='text' name='submit_orig_url' value='<?php echo $submitted_url; ?>' /> 
     39        <?php if ($h->currentUser->getPermission('can_post_without_link') == 'yes') { ?> 
     40            <br /><input id='submit_no_link' type='checkbox' name='no_link'>&nbsp;<?php echo $h->lang["submit_post_without_link"]; ?> 
     41        <?php } ?> 
    4842 
    49     <input type='hidden' name='submit1' value='true' /> 
    50  
    51     <tr><td colspan=3>&nbsp;</td></tr> 
    52     <tr><td>&nbsp; </td><td>&nbsp; </td><td style='text-align:right;'><input type='submit' class='submit' name='submit' value='<?php echo $h->lang['main_form_next']; ?>' /></td></tr>     
    53     </table> 
     43        <input type='hidden' name='submit1' value='true' /> 
     44        <br /> 
     45        <input id="submit_button_1" type='submit' class='submit' name='submit' value='<?php echo $h->lang['main_form_next']; ?>' /> 
    5446    </form> 
    5547 
     48</div> 

  • branches/1.0/content/plugins/submit/templates/submit2.php

    r937 r980  
    2727 
    2828?> 
     29<div id="submit_2"> 
     30 
    2931    <?php $h->showMessages(); ?> 
    3032     
    … …  
    3840            <td><?php echo $h->lang["submit_url"]; ?>&nbsp; </td> 
    3941            <td><?php echo $h->vars['submit_orig_url']; ?></td> 
    40             <td>&nbsp;</td> 
    4142        </tr> 
    4243    <?php } ?> 
    … …  
    4546        <td><?php echo $h->lang["submit_title"]; ?>&nbsp; </td> 
    4647        <td><input type='text' id='post_title' name='post_title' value='<?php echo $h->vars['submit_title']; ?>'></td> 
    47         <td id='ajax_loader'>&nbsp;</td> 
    4848    </tr> 
    4949     
    … …  
    5151    <tr> 
    5252        <td style='vertical-align: top;'><?php echo $h->lang["submit_content"]; ?>&nbsp; </td> 
    53         <td colspan='2'> 
     53        <td> 
    5454            <textarea id='post_content' name='post_content' rows='6'><?php echo $h->vars['submit_content']; ?></textarea> 
    5555        </td> 
    … …  
    5858    <tr> 
    5959        <td>&nbsp;</td> 
    60         <td colspan=2 style='vertical-align: top;' class="submit_instructions"> 
     60        <td style='vertical-align: top;' class="submit_instructions"> 
    6161            <?php echo $h->lang['submit_allowable_tags']; ?> 
    6262            <?php echo $h->vars['submit_allowable_tags']; ?> 
    … …  
    9393    <input type='hidden' name='csrf' value='<?php echo $h->csrfToken; ?>' /> 
    9494     
    95     <tr><td>&nbsp; </td><td>&nbsp; </td><td style='text-align:right;'><input type='submit' onclick="javascript:safeExit=true;" class='submit' name='submit' value='<?php echo $h->lang['main_form_next']; ?>' /></td></tr>     
     95    <tr><td>&nbsp; </td><td style='text-align:right;'><input type='submit' onclick="javascript:safeExit=true;" class='submit' name='submit' value='<?php echo $h->lang['main_form_next']; ?>' /></td></tr>     
    9696    </table> 
    9797    </form> 
     98 
     99</div> 

  • branches/1.0/content/plugins/submit/templates/submit3.php

    r847 r980  
    2626 
    2727?> 
     28<div id="submit_3"> 
     29 
    2830    <?php echo $h->lang["submit_instructions_3"]; ?> <br /><br /> 
    2931     
    … …  
    5355    <?php $h->pluginHook('submit_step3_post_buttons'); ?> 
    5456     
     57</div> 

  • branches/1.0/content/plugins/submit/templates/submit_edit.php

    r937 r980  
    2929?> 
    3030 
     31<div id="submit_edit"> 
     32 
    3133    <?php echo $h->showMessages(); ?> 
    3234     
    … …  
    3840        <td><?php echo $h->lang["submit_url"]; ?>&nbsp; </td> 
    3941        <td><?php echo "<a target='_blank' href='" . $h->vars['submit_orig_url'] . "'>" . $h->vars['submit_orig_url'] . "</a>"; ?></td> 
    40         <td>&nbsp;</td> 
    4142    </tr> 
    4243    <tr> 
    4344        <td><?php echo $h->lang["submit_title"]; ?>&nbsp; </td> 
    4445        <td><input type='text' id='post_title' name='post_title' value='<?php echo $h->vars['submit_title']; ?>'></td> 
    45         <td>&nbsp;</td> 
    4646    </tr> 
    4747     
    … …  
    5050    <tr> 
    5151        <td style='vertical-align: top;'><?php echo $h->lang["submit_content"]; ?>&nbsp; </td> 
    52         <td colspan=2> 
     52        <td> 
    5353            <textarea id='post_content' name='post_content' rows='6'><?php echo $h->vars['submit_content']; ?></textarea> 
    5454        </td> 
    … …  
    5656    <tr> 
    5757        <td>&nbsp;</td> 
    58         <td colspan=2 style='vertical-align: top;' class="submit_instructions"><?php echo $h->lang['submit_allowable_tags']; ?> 
     58        <td style='vertical-align: top;' class="submit_instructions"><?php echo $h->lang['submit_allowable_tags']; ?> 
    5959            <?php echo $h->vars['submit_allowable_tags']; ?> 
    6060        </td> 
    … …  
    7676                echo "<td>" . $h->lang["submit_tags"] . "&nbsp; </td>"; 
    7777                echo "<td><input type='text' id='post_tags' name='post_tags' value='" . $h->vars['submit_tags'] . "'></td>"; 
    78                 echo "<td>&nbsp;</td>"; 
    7978            echo "</tr>"; 
    8079        } 
    … …  
    9291                <td><?php echo $h->lang["submit_url"]; ?>&nbsp; </td> 
    9392                <td><input type='text' id='post_orig_url' name='post_orig_url' value='<?php echo $h->vars['submit_orig_url']; ?>'></td> 
    94                 <td>&nbsp;</td> 
    9593            </tr> 
    9694        <?php } ?> 
    … …  
    116114    <input type='hidden' name='csrf' value='<?php echo $h->csrfToken; ?>' /> 
    117115     
    118     <tr><td>&nbsp; </td><td>&nbsp; </td><td style='text-align:right;'><input type='submit' class='submit' name='submit_edit_post' value='<?php echo $h->lang["main_form_update"]; ?>' /></td></tr>     
     116    <tr><td>&nbsp; </td><td style='text-align:right;'><input type='submit' class='submit' name='submit_edit_post' value='<?php echo $h->lang["main_form_update"]; ?>' /></td></tr>     
    119117    </table> 
    120118    </form> 
    … …  
    124122        <?php echo $h->lang["submit_edit_delete"]; } ?> 
    125123        </a> 
     124         
     125</div> 

  • branches/1.0/content/plugins/users/templates/users_account.php

    r847 r980  
    2929 
    3030?> 
     31<div id="users_account"> 
     32 
    3133    <h2><?php echo $h->lang["users_account"]; ?>: <?php echo $username; ?></h2> 
    3234     
    … …  
    9092        </form> 
    9193    <?php } ?> 
    92  
     94</div> 

  • branches/1.0/content/plugins/users/templates/users_edit_profile.php

    r847 r980  
    4747 
    4848?> 
     49<div id="users_edit_profile"> 
     50 
    4951    <h2><?php echo $h->lang["users_profile_edit"]; ?>: <?php echo $h->vars['user']->name; ?></h2> 
    5052     
    … …  
    6769    <input type='hidden' name='csrf' value='<?php echo $h->csrfToken; ?>' /> 
    6870    </form> 
     71</div> 

  • branches/1.0/content/plugins/users/templates/users_permissions.php

    r847 r980  
    2525 */ 
    2626?> 
     27<div id="users_permissions"> 
     28 
    2729    <h2><?php echo $h->lang["users_permissions"]; ?>: <?php echo $h->vars['user']->name; ?></h2> 
    2830     
    … …  
    4143    <div style='text-align: right'><input class='submit' type='submit' value='<?php echo  $h->lang['users_permissions_update']; ?>' /></div> 
    4244    </form> 
     45</div> 

  • branches/1.0/content/plugins/users/templates/users_settings.php

    r847 r980  
    3939 
    4040?> 
     41<div id="users_settings"> 
     42 
    4143    <h2><?php echo $h->lang["users_settings"]; ?>: <?php echo $h->vars['user']->name; ?></h2> 
    4244     
    … …  
    5355    <input type='hidden' name='csrf' value='<?php echo $h->csrfToken; ?>' /> 
    5456    </form> 
     57</div> 

  • branches/1.0/content/themes/default/header.php

    r976 r980  
    4747    <script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.2/jquery-ui.min.js?ver=1.7.2'></script> 
    4848    <script type="text/javascript" src="<?php echo BASEURL . 'javascript/hotaru.js'; ?>"></script> 
    49  
     49        
     50    <link rel="stylesheet" href="<?php echo BASEURL . 'content/themes/' . THEME . 'css/reset-fonts-grids.css'; ?>" type="text/css" /> 
     51     
    5052    <!-- Include merged files for all the plugin css and javascript (if any) --> 
    5153    <?php $h->doIncludes(); ?> 
    5254    <!-- End --> 
    53         
    54     <link rel="stylesheet" href="<?php echo BASEURL . 'content/themes/' . THEME . 'css/reset-fonts-grids.css'; ?>" type="text/css" /> 
     55     
    5556    <link rel="stylesheet" href="<?php echo BASEURL . 'content/themes/' . THEME . 'css/style.css'; ?>" type="text/css" /> 
    5657    <!-- <link rel="shortcut icon" href="<?php echo BASEURL; ?>favicon.ico" /> --> 
Note: See TracChangeset for help on using the changeset viewer.