Changeset 12479

Timestamp:

09/04/11 09:39:57 (2 years ago)

Author:

mbrevda

Message:

re #5342 - some style tweaks, add proper bi-di supposrt the languages that require it

Files:

• freepbx/trunk/amp_conf/htdocs/admin/assets/css/mainstyle-rtl.css (added)
• freepbx/trunk/amp_conf/htdocs/admin/assets/css/mainstyle.css (modified) (8 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/assets/js/script.legacy.js (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/page.modules.php (modified) (2 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/views/header.php (modified) (2 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/views/menu.php (modified) (2 diffs)
• modules/branches/2.10/backup/bin/backup.php (modified) (2 diffs)
• modules/branches/2.10/ivr/install.php (modified) (1 diff)
• modules/branches/2.10/ivr/views/entries.php (modified) (1 diff)

freepbx/trunk/amp_conf/htdocs/admin/assets/css/mainstyle.css

@@ -7 +7 @@
-body { 
-  font-family: Helvetica, Geneva, Arial, SunSans-Regular, sans-serif, Verdana, "Trebuchet MS", SunSans-Regular;
-
+ 
-}
-html,
@@ -72 +72 @@
-  float: left;
-}
-/**** global elements ****/
-a {
-  text-decoration:none;
-  color:#072966;
-}
-a:visited {
-  color:#072966;
-}
-a:hover {
-  color:#ff9933;
-}
-h1, h2, h3, h4, h5, h6 {
-  color: gray;
-}
-input, textarea {
-  border:1px solid #ccc;
-}
-input[type=text]:hover {border-color: #666 #CCC #CCC #CCC;}
-hr {
-  background-color: #DEEDF7;
-  border: 1px solid #AED0EA;
-  height: 3px;
-  border-radius: 5px;
-}
-.attention {
-  background:#ff9933;
-  /*background:red;*/
-  color:white;
-  font-weight:bold;
-}
-.attention a {
-  color:white;
-  font-weight:bold;
-}
-.attention img { 
-  vertical-align:top;
-  padding-right:5px;
-}
-div.attention {
-  border:1px solid black;
-  padding:5px;
-}
-.warning {
-  padding:10px 10px 0 10px;
-  margin:5px 0;
-  background:rgb(255,242,202);
-  border:1px dotted #ccc;
-}
-.warning p {
-  margin-top: 0;
-  margin-bottom:10px;
-}
-
-#login_message {
-  position:absolute;
-  top:55px;
-  right:5px;
-  width: 180px;
-  font-size:12px;
-  background-color: transparent;
-}
-#login_message a:link {
-  background-color: transparent;
-}
-#message-old {
-  position:absolute;
-  top:85px;
-  right:15px;
-  font-size:12px;
-}
-
-
-  
-/***** report nav *****/
-#reportnav { 
-  position:absolute; 
-/*
-  top:0px; 
-  left:10px; 
-*/
-top:0px; 
-left:280px; 
-padding: 0 0 0 0;
-   list-style-type: none;
-   font-size:12px;
-   border-right:1px solid black;
-}
-#reportnav ul {
-margin:0;
-padding:0;
-}
-#reportnav  li {
-display: inline;
-   border-left:1px solid black;
-   padding-left:6px;
-   padding-right:6px;
-}
-#reportframe { 
-position:relative; 
-top:1.5em; 
-left:10px; 
-padding: 0 0 0 0;
-}
-#panelframe { 
-position:relative; 
-top:0; 
-left:10px; 
-padding: 0 0 0 0;
-}
-
-
-/***** info popups *****/
-
+:link, a.info:hover
-  cursor:text;
-  color:black;
+  text-decoration: none;
-}
-.help {
@@ -255 +146 @@
-
-
+/**** global elements ****/
+a {
+  text-decoration:none;
+  color:#2779AA;
+}
+a:visited {
+  color:#072966;
+}
+a:hover {
+  color:#ff9933;
+}
+h1, h2, h3, h4, h5, h6 {
+  color: gray;
+}
+input, textarea {
+  border:1px solid #ccc;
+}
+input[type=text]:hover {border-color: #666 #CCC #CCC #CCC;}
+hr {
+  background-color: #DEEDF7;
+  border: 1px solid #AED0EA;
+  height: 3px;
+  border-radius: 5px;
+}
+.attention {
+  background:#ff9933;
+  /*background:red;*/
+  color:white;
+  font-weight:bold;
+}
+.attention a {
+  color:white;
+  font-weight:bold;
+}
+.attention img { 
+  vertical-align:top;
+  padding-right:5px;
+}
+div.attention {
+  border:1px solid black;
+  padding:5px;
+}
+.warning {
+  padding:10px 10px 0 10px;
+  margin:5px 0;
+  background:rgb(255,242,202);
+  border:1px dotted #ccc;
+}
+.warning p {
+  margin-top: 0;
+  margin-bottom:10px;
+}
+
+#login_message {
+  position:absolute;
+  top:55px;
+  right:5px;
+  width: 180px;
+  font-size:12px;
+  background-color: transparent;
+}
+#login_message a:link {
+  background-color: transparent;
+}
+#message-old {
+  position:absolute;
+  top:85px;
+  right:15px;
+  font-size:12px;
+}
+
-/************************* For modules page *************************/
-#modulelist ul {
@@ -279 +241 @@
-  position:absolute;
-  left:2px;
-  /*width:252px;
-  white-space: nowrap;
-  overflow: hidden;*/
-}
-#modulelist .moduleversion {
-  position:absolute;
-  left: 230px;
-  /*width:124px;
-  white-space: nowrap;
-  overflow: hidden;*/
-}
-#modulelist .modulepublisher {
-  position:absolute;
-  left: 350px;
-  /*width:204px;
-  white-space: nowrap;
-  overflow: hidden;*/
-}
-#modulelist .modulestatus {
@@ -324 +277 @@
-}
-
-
+--modue-admin--
-#modulelist .tabber, #modulelist .tabberlive {
-}
@@ -379 +332 @@
-}
-
-/************************* reload window *************************/
-/* disbaled by defualt*/
-#button_reload {
-  display:none;
-}
-#__dimScreen {
-  cursor:not-allowed;
-}
-#reloadBox {
-  border:2px solid #333;
-  background:#ff9933;
-  z-index:1000;
-  position:fixed;
-  width:450px;
-  height:320px;
-  /* background-image: url(../images/reloadbox.png); TODO: no image exists? */
-  background-repeat: repeat-x;
-}
-#reloadBox h3 {
-  margin:0.1em 0em 1em 0em;
-  color:white;
-  text-align:center;
-}
-#reloadBox a:hover {
-  color:white;
-}
-#reload_confirm {
-  padding: 0em 1em 0em 1em;
-}
-#reload_confirm ul {
-  list-style-type:none;
-}
-#reload_confirm ul li {
-  margin-top:0.4em;
-}
-#reload_reloading {
-  text-align:center;
-  cursor:wait;
-}
-#reload_reloading h2 {
-  margin-top:1.5em;
-  margin-bottom:1.5em;
-}
-#reload_reloading img {
-  text-align:center;
-}
-
-#reload_response div.moreinfo {
-  overflow:auto;
-  height:200px;
-  width:94%;
-  margin-left:2%;
-  border:1px solid #ccc;
-  padding:2px;
-}
-#reload_response div.moreinfo pre {
-  font-size:70%;
-}
-#reload_response div.buttons {
-  text-align:center;
-  padding-top:10px;
-}
-
-#moduleBox {
-  border:2px solid #333;
-  background:#ff9933;
-  z-index:1000;
-  position:fixed;
-  width:450px;
-  height:400px;
-  /* background-image: url(../images/reloadbox.png); TODO: no image exists? */
-  background-repeat: repeat-x;
-}
-#moduleBox iframe {
-  width:420px;
-  height:400px;
-  border:0;
-  padding: 0em 1em 0em 1em;
-}
-
-/* Need to get rid of scroll bar at bottom of iframe-how*/
-#moduleBox iframe body {
-  min-width: 300px;
-}
-#moduleBoxContents {
-  padding: 0em 1em 0em 1em;
-}
-#moduleBoxContents h4 {
-  margin:0.1em 0em 1em 0em;
-  color: white;
-}
-#moduleBoxContents a {
-  text-align:right;
-}
-#moduleBoxContents a:hover {
-  color:white;
-}
-
-
-/**** tables with alternating colors ***/
@@ -486 +341 @@
-}
-/************** jQuery UI *************************/
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-  font-weight: bold;
-  padding: .0em .4em;
@@ -503 +357 @@
-  line-height: 1.5;
-}
+/*not sure what this does -MB*/
-.menubar .ui-menu  a {
-  color: #2E6E9E;
-  font-weight: normal;
-}
-
-
+
+
-input[type="submit"]{ height: 25px;}
+
+/*rnav*/
-.rnav .ui-widget-content {background: none;}
-.rnav .ui-widget-content a {color: #072966;}

freepbx/trunk/amp_conf/htdocs/admin/assets/js/script.legacy.js

@@ -675 +675 @@
-  switch (action) {
-    case 'show':
-
+
+
-      break;
-    case 'hide':

freepbx/trunk/amp_conf/htdocs/admin/page.modules.php

@@ -48 +48 @@
-  ?>
-  <script type="text/javascript">
+  $(document).ready(function(){
+    $('.repo_boxes').find('input[type=checkbox]').button()
+  })
-  function toggleInfoPane(pane) {
-    var style = document.getElementById(pane).style;
@@ -1008 +1011 @@
-      <tr>
-        <td>
-a href="#" class="info"><?php echo _("Repositories")?><span><?php echo $tooltip ?></span></a
+?php echo fpbx_label(_("Repositories"), $tooltip); ?
-        </td><td>
-          <table>
-
+ class="repo_boxes"
-              <td>
-                <input id="standard_repo" type="checkbox" name="active_repos[standard]" value="1" tabindex="<?php echo ++$tabindex;?>"<?php echo isset($active_repos['standard'])?"checked":""?>/>
-active_repos[standard]
+standard_repo
-              </td>
-              <td>
-                <input id="extended_repo" type="checkbox" name="active_repos[extended]" value="1" tabindex="<?php echo ++$tabindex;?>"<?php echo isset($active_repos['extended'])?"checked":""?>/>
-active_repos[extended]
+extended_repo
-              </td>
-              <td>
-                <input id="unsupported_repo" type="checkbox" name="active_repos[unsupported]" value="1" tabindex="<?php echo ++$tabindex;?>"<?php echo isset($active_repos['unsupported'])?"checked":""?>/>
-active_repos[unsupported]
+unsupported_repo
-              </td>
-              <td>
-                <input id="commercial_repo" type="checkbox" name="active_repos[commercial]" value="1" tabindex="<?php echo ++$tabindex;?>"<?php echo isset($active_repos['commercial'])?"checked":""?>/>
-active_repos[commercial]
+commercial_repo
-              </td>
-            </tr>

freepbx/trunk/amp_conf/htdocs/admin/views/header.php

@@ -28 +28 @@
-$html .= '<link href="' . framework_css().$version_tag . '" rel="stylesheet" type="text/css">';
-
-
-
-
-
-
-
+
+
+
+
-// Insert a custom CSS sheet if specified (this can change what is in the main CSS)
-if ($amp_conf['BRAND_CSS_CUSTOM']) {
@@ -39 +37 @@
-      . $version_tag . '" rel="stylesheet" type="text/css">';
-}
+
+//it seems extremely difficult to put jquery in the footer with the other scripts
+$html .= '<script src="//ajax.googleapis.com/ajax/libs/jquery/' . $jquery . '/jquery.min.js"></script>';
+$html .= '<script>window.jQuery || document.write(\'<script src="assets/js/jquery-' 
+    . $jquery . '.min.js"><\/script>\')</script>';
+    
-$html .= '</head>';
-
-//open body
-
-
-
+
-
-$html .= '<div id="page">';//open page

freepbx/trunk/amp_conf/htdocs/admin/views/menu.php

@@ -5 +5 @@
-
-if (isset($fpbx_menu) && is_array($fpbx_menu)) {  
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-  foreach ($fpbx_menu as $mod => $deets) {
@@ -82 +73 @@
-
-if ( isset($_SESSION['AMP_user']) && ($authtype != 'none')) {
-button id="user_logout
+a id="user_logout" href="#
-      . ' class="button-right ui-widget-content ui-state-default" title="logout">'
-      . _('Logout: ') . (isset($_SESSION['AMP_user']->username) ? $_SESSION['AMP_user']->username : 'ERROR')
-button
+a
-}
-
-button id="button_reload
-button
+a id="button_reload" href="#
+a
-
-//'<div style="width:100%;height:0px;clear:both"></div>';
+
-$out .= '</div>';//header
-$out .= '<div id="page_body">';

modules/branches/2.10/backup/bin/backup.php

@@ -51 +51 @@
-      backup_log(_('Creating backup...'));
-      $b->create_backup_file();
-
+//run backup remotly
-      $opts = array(
-          'bu'  => $bu,
@@ -87 +87 @@
-    } 
-    
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-      
-
-
-
-
-
-
+
-    backup_log('backup id ' . $vars['id'] . ' not found!');
-  }

modules/branches/2.10/ivr/install.php

@@ -7 +7 @@
-if($amp_conf["AMPDBENGINE"] == "sqlite3")  {
-  sql("CREATE TABLE IF NOT EXISTS `ivr_details` (
-
+ 
-    `name` varchar(50) default NULL,
-    `description` varchar(150) default NULL,

modules/branches/2.10/ivr/views/entries.php

@@ -62 +62 @@
-$ret = '';
-$ret .= $table->generate();
-ie
+y
-    . '" id="add_entrie">';
-